Demo CRYPT_EAL_Init Rectification-openHiTLS-AtomGit

已合并

Demo CRYPT_EAL_Init Rectification #1121

Demo CRYPT_EAL_Init Rectification #1121

已合并

XuZhengYi创建于 3月6日

共 11 个文件变更+13-13

	@@ -149,21 +149,20 @@ int main(void)
149	if (ret != CRYPT_SUCCESS) {	149	if (ret != CRYPT_SUCCESS) {
150	printf("error code is %x\n", ret);	150	printf("error code is %x\n", ret);
151	PrintLastError();	151	PrintLastError();
152	- BSL_ERR_DeInit();
153	return ret;	152	return ret;
154	}	153	}
155		154
156	CRYPT_EAL_CipherCtx *ctx = CRYPT_EAL_CipherNewCtx(CRYPT_CIPHER_AES128_CFB);	155	CRYPT_EAL_CipherCtx *ctx = CRYPT_EAL_CipherNewCtx(CRYPT_CIPHER_AES128_CFB);
157	if (ctx == NULL) {	156	if (ctx == NULL) {
158	PrintLastError();	157	PrintLastError();
159	- BSL_ERR_DeInit();	158	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
160	return CRYPT_MEM_ALLOC_FAIL;	159	return CRYPT_MEM_ALLOC_FAIL;
161	}	160	}
162		161
163	ret = RunDemo(ctx);	162	ret = RunDemo(ctx);
164		163
165	CRYPT_EAL_CipherFreeCtx(ctx);	164	CRYPT_EAL_CipherFreeCtx(ctx);
166	- BSL_ERR_DeInit();	165	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
167	return ret;	166	return ret;
168	}	167	}
169		168

	@@ -68,7 +68,7 @@ int main(void)
68	CRYPT_EAL_CipherCtx *ctx = CRYPT_EAL_CipherNewCtx(CRYPT_CIPHER_AES128_CBC);	68	CRYPT_EAL_CipherCtx *ctx = CRYPT_EAL_CipherNewCtx(CRYPT_CIPHER_AES128_CBC);
69	if (ctx == NULL) {	69	if (ctx == NULL) {
70	PrintLastError();	70	PrintLastError();
71	- BSL_ERR_DeInit();	71	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
72	return 1;	72	return 1;
73	}	73	}
74	/*	74	/*
	@@ -175,6 +175,6 @@ int main(void)
175		175
176	EXIT:	176	EXIT:
177	CRYPT_EAL_CipherFreeCtx(ctx);	177	CRYPT_EAL_CipherFreeCtx(ctx);
178	- BSL_ERR_DeInit();	178	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
179	return ret;	179	return ret;
180	}	180	}

	@@ -157,5 +157,6 @@ EXIT:
157	HITLS_X509_CertFree(rootCA);	157	HITLS_X509_CertFree(rootCA);
158	HITLS_X509_CertFree(subCA);	158	HITLS_X509_CertFree(subCA);
159	BSL_UIO_Free(uio);	159	BSL_UIO_Free(uio);
		160	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
160	return exitValue;	161	return exitValue;
161	}	162	}

	@@ -81,7 +81,6 @@ int main(void)
81		81
82	EXIT:	82	EXIT:
83	// Release the context memory.	83	// Release the context memory.
84	- CRYPT_EAL_RandDeinit();	84	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
85	- BSL_ERR_DeInit();
86	return ret;	85	return ret;
87	}	86	}

	@@ -134,10 +134,9 @@ int main(void)
134		134
135	EXIT:	135	EXIT:
136	// Release the context memory.	136	// Release the context memory.
137	- CRYPT_EAL_RandDeinit();
138	CRYPT_EAL_PkeyFreeCtx(prvCtx);	137	CRYPT_EAL_PkeyFreeCtx(prvCtx);
139	CRYPT_EAL_PkeyFreeCtx(pubCtx);	138	CRYPT_EAL_PkeyFreeCtx(pubCtx);
140	BSL_SAL_Free(shareKey);	139	BSL_SAL_Free(shareKey);
141	- BSL_ERR_DeInit();	140	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
142	return ret;	141	return ret;
143	}	142	}

	@@ -339,5 +339,6 @@ EXIT:
339	BSL_SAL_FREE(tokenRequestBuff);	339	BSL_SAL_FREE(tokenRequestBuff);
340	BSL_SAL_FREE(tokenResponseBuff);	340	BSL_SAL_FREE(tokenResponseBuff);
341	BSL_SAL_FREE(finalTokenBuff);	341	BSL_SAL_FREE(finalTokenBuff);
		342	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
342	return ret;	343	return ret;
343	}	344	}

	@@ -173,5 +173,6 @@ EXIT:
173	HITLS_X509_CertFree(serverCert);	173	HITLS_X509_CertFree(serverCert);
174	CRYPT_EAL_PkeyFreeCtx(pkey);	174	CRYPT_EAL_PkeyFreeCtx(pkey);
175	BSL_UIO_Free(uio);	175	BSL_UIO_Free(uio);
		176	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
176	return exitValue;	177	return exitValue;
177	}	178	}

	@@ -90,7 +90,6 @@ int main(void) {
90	EXIT:	90	EXIT:
91	// Release the context memory.	91	// Release the context memory.
92	CRYPT_EAL_PkeyFreeCtx(pkey);	92	CRYPT_EAL_PkeyFreeCtx(pkey);
93	- CRYPT_EAL_RandDeinit();	93	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
94	- BSL_ERR_DeInit();
95	return ret;	94	return ret;
96	}	95	}

	@@ -92,7 +92,6 @@ int main(void)
92	EXIT:	92	EXIT:
93	// Release the context memory.	93	// Release the context memory.
94	CRYPT_EAL_PkeyFreeCtx(ctx);	94	CRYPT_EAL_PkeyFreeCtx(ctx);
95	- CRYPT_EAL_RandDeinit();	95	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
96	- BSL_ERR_DeInit();
97	return ret;	96	return ret;
98	}	97	}

	@@ -200,5 +200,6 @@ EXIT:
200	HITLS_X509_CertFree(rootCA);	200	HITLS_X509_CertFree(rootCA);
201	HITLS_X509_CertFree(subCA);	201	HITLS_X509_CertFree(subCA);
202	BSL_UIO_Free(uio);	202	BSL_UIO_Free(uio);
		203	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
203	return exitValue;	204	return exitValue;
204	}	205	}

	@@ -215,5 +215,6 @@ EXIT:
215	HITLS_X509_CertFree(serverCert);	215	HITLS_X509_CertFree(serverCert);
216	CRYPT_EAL_PkeyFreeCtx(pkey);	216	CRYPT_EAL_PkeyFreeCtx(pkey);
217	BSL_UIO_Free(uio);	217	BSL_UIO_Free(uio);
		218	+ CRYPT_EAL_Cleanup(CRYPT_EAL_INIT_ALL);
218	return exitValue;	219	return exitValue;
219	}	220	}