diff options
author | tb <> | 2022-11-18 14:45:10 +0000 |
---|---|---|
committer | tb <> | 2022-11-18 14:45:10 +0000 |
commit | 54b961b017cbfded9bc4892699ccbc35bebf5c6f (patch) | |
tree | 48e2b4585e54a8205c6dbeb0131ead3e7cfc4d15 /src/lib/libcrypto/cmac/cm_pmeth.c | |
parent | 5673137f00930926e8191aab226a21afaea9ad31 (diff) | |
download | openbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.tar.gz openbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.tar.bz2 openbsd-54b961b017cbfded9bc4892699ccbc35bebf5c6f.zip |
Change the pkey.ptr from char * to void *
Now that EVP_PKEY is opaque, there is no reason to keep the ptr member
of the pkey union as a weird char pointer, a void pointer will do. This
avoids a few stupid casts and simplifies an upcoming diff.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/cmac/cm_pmeth.c')
-rw-r--r-- | src/lib/libcrypto/cmac/cm_pmeth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c index d9059ca4a8..91f7e34c29 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.8 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: cm_pmeth.c,v 1.9 2022/11/18 14:45:10 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 | */ |
@@ -148,8 +148,7 @@ pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) | |||
148 | break; | 148 | break; |
149 | 149 | ||
150 | case EVP_PKEY_CTRL_MD: | 150 | case EVP_PKEY_CTRL_MD: |
151 | if (ctx->pkey && !CMAC_CTX_copy(ctx->data, | 151 | if (ctx->pkey && !CMAC_CTX_copy(ctx->data, ctx->pkey->pkey.ptr)) |
152 | (CMAC_CTX *)ctx->pkey->pkey.ptr)) | ||
153 | return 0; | 152 | return 0; |
154 | if (!CMAC_Init(cmctx, NULL, 0, NULL, NULL)) | 153 | if (!CMAC_Init(cmctx, NULL, 0, NULL, NULL)) |
155 | return 0; | 154 | return 0; |