From: Nicholas Cooper <qza22c5l@gmail.com>
Date: Mon, 28 Sep 2015 19:57:46 +0000 (-0400)
Subject: RT3948: Some structs have confusing names.
X-Git-Tag: OpenSSL_1_1_0-pre1~494
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=ef85320622bdc264ab2741d0461fa79a4934c93f;ds=sidebyside

RT3948: Some structs have confusing names.

Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index f92f1099f0..c60d178825 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -148,7 +148,7 @@ struct evp_pkey_st {
 # define EVP_PKEY_MO_DECRYPT     0x0008
 
 # ifndef EVP_MD
-struct env_md_st {
+struct evp_md_st {
     int type;
     int pkey_type;
     int md_size;
@@ -256,7 +256,7 @@ typedef int evp_verify_method(int type, const unsigned char *m,
 
 # endif                         /* !EVP_MD */
 
-struct env_md_ctx_st {
+struct evp_md_ctx_st {
     const EVP_MD *digest;
     ENGINE *engine;             /* functional reference if 'digest' is
                                  * ENGINE-provided */
diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index e4e3270502..438434507d 100644
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -128,8 +128,8 @@ typedef struct buf_mem_st BUF_MEM;
 
 typedef struct evp_cipher_st EVP_CIPHER;
 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct env_md_st EVP_MD;
-typedef struct env_md_ctx_st EVP_MD_CTX;
+typedef struct evp_md_st EVP_MD;
+typedef struct evp_md_ctx_st EVP_MD_CTX;
 typedef struct evp_pkey_st EVP_PKEY;
 
 typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;