diff options
| author | tb <> | 2022-11-18 14:45:10 +0000 |
|---|---|---|
| committer | tb <> | 2022-11-18 14:45:10 +0000 |
| commit | 3ceb42d62047d438cd7b6b6a201682452faf30fc (patch) | |
| tree | 48e2b4585e54a8205c6dbeb0131ead3e7cfc4d15 /src/lib/libcrypto/hmac/hm_pmeth.c | |
| parent | 41d386b23bbf3c918e8a2e1e6b980bad1bce714d (diff) | |
| download | openbsd-3ceb42d62047d438cd7b6b6a201682452faf30fc.tar.gz openbsd-3ceb42d62047d438cd7b6b6a201682452faf30fc.tar.bz2 openbsd-3ceb42d62047d438cd7b6b6a201682452faf30fc.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/hmac/hm_pmeth.c')
| -rw-r--r-- | src/lib/libcrypto/hmac/hm_pmeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/hmac/hm_pmeth.c b/src/lib/libcrypto/hmac/hm_pmeth.c index 4017f570b8..3ba5b47027 100644 --- a/src/lib/libcrypto/hmac/hm_pmeth.c +++ b/src/lib/libcrypto/hmac/hm_pmeth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: hm_pmeth.c,v 1.13 2022/03/30 07:17:48 tb Exp $ */ | 1 | /* $OpenBSD: hm_pmeth.c,v 1.14 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 2007. | 3 | * project 2007. |
| 4 | */ | 4 | */ |
| @@ -202,7 +202,7 @@ pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) | |||
| 202 | break; | 202 | break; |
| 203 | 203 | ||
| 204 | case EVP_PKEY_CTRL_DIGESTINIT: | 204 | case EVP_PKEY_CTRL_DIGESTINIT: |
| 205 | key = (ASN1_OCTET_STRING *)ctx->pkey->pkey.ptr; | 205 | key = ctx->pkey->pkey.ptr; |
| 206 | if (!HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md, | 206 | if (!HMAC_Init_ex(&hctx->ctx, key->data, key->length, hctx->md, |
| 207 | ctx->engine)) | 207 | ctx->engine)) |
| 208 | return 0; | 208 | return 0; |
