diff options
| -rw-r--r-- | crypto/pem/pem_err.c | 2 | ||||
| -rw-r--r-- | include/openssl/pem.h | 20 | ||||
| -rwxr-xr-x | util/bat.sh | 3 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 3 | ||||
| -rwxr-xr-x | util/mkdef.pl | 1 |
5 files changed, 2 insertions, 27 deletions
diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c index 56d37eb231..49b8a91043 100644 --- a/crypto/pem/pem_err.c +++ b/crypto/pem/pem_err.c @@ -104,8 +104,6 @@ static ERR_STRING_DATA PEM_str_functs[] = { {ERR_FUNC(PEM_F_PEM_READ_BIO_PRIVATEKEY), "PEM_read_bio_PrivateKey"}, {ERR_FUNC(PEM_F_PEM_READ_DHPARAMS), "PEM_read_DHparams"}, {ERR_FUNC(PEM_F_PEM_READ_PRIVATEKEY), "PEM_read_PrivateKey"}, - {ERR_FUNC(PEM_F_PEM_SEALFINAL), "PEM_SealFinal"}, - {ERR_FUNC(PEM_F_PEM_SEALINIT), "PEM_SealInit"}, {ERR_FUNC(PEM_F_PEM_SIGNFINAL), "PEM_SignFinal"}, {ERR_FUNC(PEM_F_PEM_WRITE), "PEM_write"}, {ERR_FUNC(PEM_F_PEM_WRITE_BIO), "PEM_write_bio"}, diff --git a/include/openssl/pem.h b/include/openssl/pem.h index fe2cf11f14..d8efce9f8c 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -98,16 +98,6 @@ extern "C" { # define PEM_STRING_PARAMETERS "PARAMETERS" # define PEM_STRING_CMS "CMS" - /* - * Note that this structure is initialised by PEM_SealInit and cleaned up - * by PEM_SealFinal (at least for now) - */ -typedef struct PEM_Encode_Seal_st { - EVP_ENCODE_CTX *encode; - EVP_MD_CTX *md; - EVP_CIPHER_CTX cipher; -} PEM_ENCODE_SEAL_CTX; - # define PEM_TYPE_ENCRYPTED 10 # define PEM_TYPE_MIC_ONLY 20 # define PEM_TYPE_MIC_CLEAR 30 @@ -376,14 +366,6 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u); #endif -int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, - EVP_MD *md_type, unsigned char **ek, int *ekl, - unsigned char *iv, EVP_PKEY **pubk, int npubk); -int PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl, - unsigned char *in, int inl); -int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl, - unsigned char *out, int *outl, EVP_PKEY *priv); - int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type); int PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt); int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, @@ -516,8 +498,6 @@ void ERR_load_PEM_strings(void); # define PEM_F_PEM_READ_BIO_PRIVATEKEY 123 # define PEM_F_PEM_READ_DHPARAMS 142 # define PEM_F_PEM_READ_PRIVATEKEY 124 -# define PEM_F_PEM_SEALFINAL 110 -# define PEM_F_PEM_SEALINIT 111 # define PEM_F_PEM_SIGNFINAL 112 # define PEM_F_PEM_WRITE 113 # define PEM_F_PEM_WRITE_BIO 114 diff --git a/util/bat.sh b/util/bat.sh index dee56d74a3..da404a7c2d 100755 --- a/util/bat.sh +++ b/util/bat.sh @@ -99,8 +99,7 @@ sub var_add @a=grep(!/(^md5)|(_md5$)/,@a) if $no_md5; @a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa; - @a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa; - @a=grep(!/(^pem_seal$)/,@a) if $no_rsa; + @a=grep(!/(^p_open$)/,@a) if $no_rsa; @a=grep(!/(m_dss$)|(m_dss1$)/,@a) if $no_dsa; @a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/,@a) if $no_dsa; diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 491a1bb276..f4148ff7cb 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -1077,8 +1077,7 @@ sub var_add @a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd; @a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa; - @a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa; - @a=grep(!/(^pem_seal$)/,@a) if $no_rsa; + @a=grep(!/(^p_open$)/,@a) if $no_rsa; @a=grep(!/(m_dss$)|(m_dss1$)/,@a) if $no_dsa; @a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/,@a) if $no_dsa; diff --git a/util/mkdef.pl b/util/mkdef.pl index 08dacf2661..fd36a0d7da 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -980,7 +980,6 @@ sub do_defs $a .= ",RC5" if($s =~ /EVP_rc5/); $a .= ",RMD160" if($s =~ /EVP_ripemd/); $a .= ",RSA" if($s =~ /EVP_(Open|Seal)(Final|Init)/); - $a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/); $a .= ",RSA" if($s =~ /RSAPrivateKey/); $a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/); |