summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cmac
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/cmac')
-rw-r--r--src/lib/libcrypto/cmac/cm_pmeth.c4
-rw-r--r--src/lib/libcrypto/cmac/cmac.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c
index d47cfb7b73..fa2d53e53d 100644
--- a/src/lib/libcrypto/cmac/cm_pmeth.c
+++ b/src/lib/libcrypto/cmac/cm_pmeth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cm_pmeth.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */ 1/* $OpenBSD: cm_pmeth.c,v 1.11 2023/11/29 21:35:57 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2010. 3 * project 2010.
4 */ 4 */
@@ -143,7 +143,7 @@ pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
143 break; 143 break;
144 144
145 case EVP_PKEY_CTRL_CIPHER: 145 case EVP_PKEY_CTRL_CIPHER:
146 if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine)) 146 if (!CMAC_Init(cmctx, NULL, 0, p2, NULL))
147 return 0; 147 return 0;
148 break; 148 break;
149 149
diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c
index f5b5f5e320..f653219b8f 100644
--- a/src/lib/libcrypto/cmac/cmac.c
+++ b/src/lib/libcrypto/cmac/cmac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cmac.c,v 1.15 2023/11/29 18:11:10 tb Exp $ */ 1/* $OpenBSD: cmac.c,v 1.16 2023/11/29 21:35:57 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -178,7 +178,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
178 int bl; 178 int bl;
179 179
180 /* All zeros means restart */ 180 /* All zeros means restart */
181 if (key == NULL && cipher == NULL && impl == NULL && keylen == 0) { 181 if (key == NULL && cipher == NULL && keylen == 0) {
182 /* Not initialised */ 182 /* Not initialised */
183 if (ctx->nlast_block == -1) 183 if (ctx->nlast_block == -1)
184 return 0; 184 return 0;
@@ -191,7 +191,7 @@ CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
191 191
192 /* Initialise context. */ 192 /* Initialise context. */
193 if (cipher != NULL) { 193 if (cipher != NULL) {
194 if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, impl, NULL, NULL)) 194 if (!EVP_EncryptInit_ex(&ctx->cctx, cipher, NULL, NULL, NULL))
195 return 0; 195 return 0;
196 } 196 }
197 197