diff options
| author | tb <> | 2023-08-11 05:10:35 +0000 |
|---|---|---|
| committer | tb <> | 2023-08-11 05:10:35 +0000 |
| commit | ccf80370e13df3645f5a40674dded2e94f8cb0e9 (patch) | |
| tree | 851d91b01772d5190df31baa2f963490f98e3568 /src/lib/libcrypto/evp | |
| parent | 26e17c246c08a4ed6ef78ed3841fb88f6678a823 (diff) | |
| download | openbsd-ccf80370e13df3645f5a40674dded2e94f8cb0e9.tar.gz openbsd-ccf80370e13df3645f5a40674dded2e94f8cb0e9.tar.bz2 openbsd-ccf80370e13df3645f5a40674dded2e94f8cb0e9.zip | |
Rename env_md{,_ctx}_st to evp_md{,_ctx}_st
As everyone knows (and who doesn't know will immediately guess), EVP is
short for envelope. Most structs backing the public EVP_* types are called
evp_*. For the EVP_MD and EVP_MD_CTX types, someone used env_md_st and
env_md_ctx_st, which, as jsing pointed out, may or may not be related to
a much less obvious abbreviation of envelope. It could also simply have
been for reasons of inconsistency.
Be all that as it may: rename these structs to use the evp_* namespace
to match all the other EVP types, as well as upstream.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/evp')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_local.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/evp_local.h b/src/lib/libcrypto/evp/evp_local.h index 9905b82dd5..e0a8afd6b8 100644 --- a/src/lib/libcrypto/evp/evp_local.h +++ b/src/lib/libcrypto/evp/evp_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_local.h,v 1.3 2023/03/01 11:16:06 tb Exp $ */ | 1 | /* $OpenBSD: evp_local.h,v 1.4 2023/08/11 05:10:35 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 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -115,7 +115,7 @@ struct evp_pkey_st { | |||
| 115 | STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */ | 115 | STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */ |
| 116 | } /* EVP_PKEY */; | 116 | } /* EVP_PKEY */; |
| 117 | 117 | ||
| 118 | struct env_md_st { | 118 | struct evp_md_st { |
| 119 | int type; | 119 | int type; |
| 120 | int pkey_type; | 120 | int pkey_type; |
| 121 | int md_size; | 121 | int md_size; |
| @@ -132,7 +132,7 @@ struct env_md_st { | |||
| 132 | int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2); | 132 | int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2); |
| 133 | } /* EVP_MD */; | 133 | } /* EVP_MD */; |
| 134 | 134 | ||
| 135 | struct env_md_ctx_st { | 135 | struct evp_md_ctx_st { |
| 136 | const EVP_MD *digest; | 136 | const EVP_MD *digest; |
| 137 | ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */ | 137 | ENGINE *engine; /* functional reference if 'digest' is ENGINE-provided */ |
| 138 | unsigned long flags; | 138 | unsigned long flags; |
