提交 f7752452 编写于 作者: B Benjamin Kaduk 提交者: Richard Levitte

Remove some unused PEM structures

Reviewed-by: NEmilia Käsper <emilia@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2797)
上级 5a81a050
...@@ -54,56 +54,6 @@ extern "C" { ...@@ -54,56 +54,6 @@ extern "C" {
# define PEM_TYPE_MIC_CLEAR 30 # define PEM_TYPE_MIC_CLEAR 30
# define PEM_TYPE_CLEAR 40 # define PEM_TYPE_CLEAR 40
typedef struct pem_recip_st {
char *name;
X509_NAME *dn;
int cipher;
int key_enc;
/* char iv[8]; unused and wrong size */
} PEM_USER;
typedef struct pem_ctx_st {
int type; /* what type of object */
struct {
int version;
int mode;
} proc_type;
char *domain;
struct {
int cipher;
/*-
unused, and wrong size
unsigned char iv[8]; */
} DEK_info;
PEM_USER *originator;
int num_recipient;
PEM_USER **recipient;
/*-
XXX(ben): don#t think this is used!
STACK *x509_chain; / * certificate chain */
EVP_MD *md; /* signature type */
int md_enc; /* is the md encrypted or not? */
int md_len; /* length of md_data */
char *md_data; /* message digest, could be pkey encrypted */
EVP_CIPHER *dec; /* date encryption cipher */
int key_len; /* key length */
unsigned char *key; /* key */
/*-
unused, and wrong size
unsigned char iv[8]; */
int data_enc; /* is the data encrypted */
int data_len;
unsigned char *data;
} PEM_CTX;
/* /*
* These macros make the PEM_read/PEM_write functions easier to maintain and * These macros make the PEM_read/PEM_write functions easier to maintain and
* write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or
......
...@@ -347,9 +347,7 @@ ...@@ -347,9 +347,7 @@
-T PBEPARAM -T PBEPARAM
-T PBKDF2PARAM -T PBKDF2PARAM
-T PCRYPTO_MEM_LEAK_CB -T PCRYPTO_MEM_LEAK_CB
-T PEM_CTX
-T PEM_ENCODE_SEAL_CTX -T PEM_ENCODE_SEAL_CTX
-T PEM_USER
-T PHEAPENTRY32 -T PHEAPENTRY32
-T PHEAPLIST32 -T PHEAPLIST32
-T PKCS12 -T PKCS12
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册