Move EVP_PKEY_METHOD into private headers.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h
index ea7a61c146b8daf12c0e1c378adbdc1195cc1a64..218aedefeda0a3322ffc7ccb1d01a4e18e9bf64f 100644 (file)
--- 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);
 } /* 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 cc729c4d5793736c731105fe9a8e2dadf2b9df56..175be8348abb40ff317de2945d05444dc6eb0cbc 100644 (file)
--- 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);
 
 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
 #ifdef  __cplusplus
 }
 #endif

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 6e928edcc2d8a9282c658e74413b7f74a03f4ad1..0957a5892c89f62ae60bf11ddb5facaa6d03a556 100644 (file)
--- 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
 
 # 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;\
 #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 589216e741b8ac125ca6920da23feb4115aa36bb..8fd55961cb1a92cba6efd7d2146fbc7c994df142 100644 (file)
--- 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)
 
 # 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
 /* 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 c3cd8edd7d20572e9b21151a81971b032f431bde..6ea4e419c4e3242284c4499cb9a6847d5b7ccf3f 100644 (file)
--- 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
 
 # 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
 /* 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 d7ecf54ad8dc7b127e9d27a64f6b39f7da0718cd..81aa49da49969d42aee5dd1fad8d0ad1e1b5f03d 100644 (file)
--- 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);
 
 
 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
 

-extern const EVP_PKEY_METHOD hmac_pkey_meth;
-

 #ifdef  __cplusplus
 }
 #endif
 #ifdef  __cplusplus
 }
 #endif

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 536a78e08b870255e3eabb7c86ac4495b2ae18bb..9abb2a1eda004ba99f29f362b63318ba2504142f 100644 (file)
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -508,8 +508,6 @@ RSA *RSAPrivateKey_dup(RSA *rsa);
  */
 # define RSA_FLAG_CHECKED                        0x0800
 
  */
 # 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
 /* BEGIN ERROR CODES */
 /*
  * The following lines are auto generated by the script mkerr.pl. Any changes