[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ef85320622bdc264ab2741d0461fa79a4934c93f (commit)
      from  fecd04e9104bc4216297ec3756783ef27348280c (commit)


- Log -----------------------------------------------------------------
commit ef85320622bdc264ab2741d0461fa79a4934c93f
Author: Nicholas Cooper <qza22c5l at gmail.com>
Date:   Mon Sep 28 15:57:46 2015 -0400

    RT3948: Some structs have confusing names.
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/evp.h      | 4 ++--
 include/openssl/ossl_typ.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index f92f109..c60d178 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 e4e3270..4384345 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;