From f77524524548be9740b143bccfde7565493ae78e Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Tue, 28 Feb 2017 15:51:38 -0600 Subject: [PATCH] Remove some unused PEM structures MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper Reviewed-by: Rich Salz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2797) --- include/openssl/pem.h | 50 ------------------------------------------- util/indent.pro | 2 -- 2 files changed, 52 deletions(-) diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 2375d63553..431ee3e5ab 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -54,56 +54,6 @@ extern "C" { # define PEM_TYPE_MIC_CLEAR 30 # 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 * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or diff --git a/util/indent.pro b/util/indent.pro index 74e5680edb..aa5833d233 100644 --- a/util/indent.pro +++ b/util/indent.pro @@ -347,9 +347,7 @@ -T PBEPARAM -T PBKDF2PARAM -T PCRYPTO_MEM_LEAK_CB --T PEM_CTX -T PEM_ENCODE_SEAL_CTX --T PEM_USER -T PHEAPENTRY32 -T PHEAPLIST32 -T PKCS12 -- 2.34.1