[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  8f463dbddd67eb86b4fdf49893132fdcc6d219bc (commit)
      from  777ae7c4eea9e517cfacddb92c37c481ad500747 (commit)


- Log -----------------------------------------------------------------
commit 8f463dbddd67eb86b4fdf49893132fdcc6d219bc
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Sep 19 22:13:22 2015 +0100

    Move EVP_PKEY_METHOD into private headers.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/include/internal/evp_int.h | 8 ++++++++
 include/openssl/cmac.h            | 2 --
 include/openssl/dh.h              | 3 ---
 include/openssl/dsa.h             | 2 --
 include/openssl/ec.h              | 2 --
 include/openssl/hmac.h            | 2 --
 include/openssl/rsa.h             | 2 --
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h
index ea7a61c..218aede 100644
--- a/crypto/include/internal/evp_int.h
+++ b/crypto/include/internal/evp_int.h
@@ -121,3 +121,11 @@ struct evp_pkey_method_st {
 } /* EVP_PKEY_METHOD */ ;
 
 void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
+
+extern const EVP_PKEY_METHOD cmac_pkey_meth;
+extern const EVP_PKEY_METHOD dh_pkey_meth;
+extern const EVP_PKEY_METHOD dhx_pkey_meth;
+extern const EVP_PKEY_METHOD dsa_pkey_meth;
+extern const EVP_PKEY_METHOD ec_pkey_meth;
+extern const EVP_PKEY_METHOD hmac_pkey_meth;
+extern const EVP_PKEY_METHOD rsa_pkey_meth;
diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h
index cc729c4..175be83 100644
--- a/include/openssl/cmac.h
+++ b/include/openssl/cmac.h
@@ -76,8 +76,6 @@ int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
 int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
 int CMAC_resume(CMAC_CTX *ctx);
 
-extern const EVP_PKEY_METHOD cmac_pkey_meth;
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 6e928ed..0957a58 100644
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -342,9 +342,6 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
 # define EVP_PKEY_DH_KDF_X9_42                           2
 # endif
 
-extern const EVP_PKEY_METHOD dh_pkey_meth;
-extern const EVP_PKEY_METHOD dhx_pkey_meth;
-
 #define declare_dh_bn(x) \
         const extern BIGNUM _bignum_dh##x##_p;\
         const extern BIGNUM _bignum_dh##x##_g;\
diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index 589216e..8fd5596 100644
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -276,8 +276,6 @@ DH *DSA_dup_DH(const DSA *r);
 # define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
 # define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
 
-extern const EVP_PKEY_METHOD dsa_pkey_meth;
-
 /* BEGIN ERROR CODES */
 /*
  * The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index c3cd8ed..6ea4e41 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -1067,8 +1067,6 @@ int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 # define EVP_PKEY_ECDH_KDF_NONE                          1
 # define EVP_PKEY_ECDH_KDF_X9_62                         2
 
-extern const EVP_PKEY_METHOD ec_pkey_meth;
-
 /* BEGIN ERROR CODES */
 /*
  * The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index d7ecf54..81aa49d 100644
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -104,8 +104,6 @@ __owur int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 
 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
 
-extern const EVP_PKEY_METHOD hmac_pkey_meth;
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 536a78e..9abb2a1 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -508,8 +508,6 @@ RSA *RSAPrivateKey_dup(RSA *rsa);
  */
 # define RSA_FLAG_CHECKED                        0x0800
 
-extern const EVP_PKEY_METHOD rsa_pkey_meth;
-
 /* BEGIN ERROR CODES */
 /*
  * The following lines are auto generated by the script mkerr.pl. Any changes