More EVP_CIPHER_CTX_reset changes

dengert · dengert · commit 450f344a34e7 · 2022-02-18T06:54:27.000-06:00
Changes to be committed:
	modified:   src/libopensc/card-gpk.c
	modified:   src/libopensc/card-piv.c
diff --git a/src/libopensc/card-gpk.c b/src/libopensc/card-gpk.c
@@ -908,14 +908,14 @@ gpk_set_filekey(const u8 *key, const u8 *challenge,
 	if (!EVP_EncryptUpdate(ctx, kats, &outl, r_rn+4, 8))
 		r = SC_ERROR_INTERNAL;
 
-	if (!EVP_CIPHER_CTX_cleanup(ctx))
+	if (!EVP_CIPHER_CTX_reset(ctx))
 		r = SC_ERROR_INTERNAL;
 	if (r == SC_SUCCESS) {
-		EVP_CIPHER_CTX_init(ctx);
+		EVP_CIPHER_CTX_reset(ctx);
 		EVP_EncryptInit_ex(ctx, EVP_des_ede(), NULL, out, NULL);
 		if (!EVP_EncryptUpdate(ctx, kats+8, &outl, r_rn+4, 8))
 			r = SC_ERROR_INTERNAL;
-	if (!EVP_CIPHER_CTX_cleanup(ctx))
+	if (!EVP_CIPHER_CTX_reset(ctx))
 		r = SC_ERROR_INTERNAL;
 	}
 	memset(out, 0, sizeof(out));
@@ -925,7 +925,7 @@ gpk_set_filekey(const u8 *key, const u8 *challenge,
 	 * here? INVALID_ARGS doesn't seem quite right
 	 */
 	if (r == SC_SUCCESS) {
-		EVP_CIPHER_CTX_init(ctx);
+		EVP_CIPHER_CTX_reset(ctx);
 		EVP_EncryptInit_ex(ctx, EVP_des_ede(), NULL, kats, NULL);
 		if (!EVP_EncryptUpdate(ctx, out, &outl, challenge, 8))
 			r = SC_ERROR_INTERNAL;
diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
@@ -1778,7 +1778,7 @@ static int piv_general_mutual_authenticate(sc_card_t *card,
 		goto err;
 	}
 
-	EVP_CIPHER_CTX_cleanup(ctx);
+	EVP_CIPHER_CTX_reset(ctx);
 
 	if (!EVP_DecryptInit(ctx, cipher, key, NULL)) {
 		r = SC_ERROR_INTERNAL;

Original file line number	Diff line number	Diff line change
`@@ -1778,7 +1778,7 @@ static int piv_general_mutual_authenticate(sc_card_t *card,`
`1778`	`1778`	`goto err;`
`1779`	`1779`	`}`
`1780`	`1780`
`1781`		`- EVP_CIPHER_CTX_cleanup(ctx);`
	`1781`	`+ EVP_CIPHER_CTX_reset(ctx);`
`1782`	`1782`
`1783`	`1783`	`if (!EVP_DecryptInit(ctx, cipher, key, NULL)) {`
`1784`	`1784`	`r = SC_ERROR_INTERNAL;`