Commit 8f463dbd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Move EVP_PKEY_METHOD into private headers. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 777ae7c4

crypto/include/internal/evp_int.h

+8 −0
Original line number Diff line number Diff line
@@ -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;

include/openssl/cmac.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/openssl/dh.h

+0 −3
Original line number Diff line number Diff line
@@ -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;\

include/openssl/dsa.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/openssl/ec.h

+0 −2
Original line number Diff line number Diff line
@@ -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