[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0c1badc8af7b92170fbb23be8119072facfdad07 (commit)
      from  21fa90b242b2078bfee324188227de8d02376e68 (commit)


- Log -----------------------------------------------------------------
commit 0c1badc8af7b92170fbb23be8119072facfdad07
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 7 23:28:15 2016 +0100

    Remove all remaining traces if PEM_Seal
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 crypto/pem/pem_err.c  |  2 --
 include/openssl/pem.h | 20 --------------------
 util/bat.sh           |  3 +--
 util/mk1mf.pl         |  3 +--
 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 56d37eb..49b8a91 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 fe2cf11..d8efce9 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 dee56d7..da404a7 100755
--- a/util/bat.sh
+++ b/util/bat.sh
@@ -99,8 +99,7 @@ sub var_add
 	@a=grep(!/(^md5)|(_md5$)/, at a) if $no_md5;
 
 	@a=grep(!/(^d2i_r_)|(^i2d_r_)/, at a) if $no_rsa;
-	@a=grep(!/(^p_open$)|(^p_seal$)/, at a) if $no_rsa;
-	@a=grep(!/(^pem_seal$)/, at a) if $no_rsa;
+	@a=grep(!/(^p_open$)/, at a) if $no_rsa;
 
 	@a=grep(!/(m_dss$)|(m_dss1$)/, at a) if $no_dsa;
 	@a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/, at a) if $no_dsa;
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 491a1bb..f4148ff 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1077,8 +1077,7 @@ sub var_add
 	@a=grep(!/(rmd)|(ripemd)/, at a) if $no_ripemd;
 
 	@a=grep(!/(^d2i_r_)|(^i2d_r_)/, at a) if $no_rsa;
-	@a=grep(!/(^p_open$)|(^p_seal$)/, at a) if $no_rsa;
-	@a=grep(!/(^pem_seal$)/, at a) if $no_rsa;
+	@a=grep(!/(^p_open$)/, at a) if $no_rsa;
 
 	@a=grep(!/(m_dss$)|(m_dss1$)/, at a) if $no_dsa;
 	@a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/, at a) if $no_dsa;
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 08dacf2..fd36a0d 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/);