Commit f7752452 authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Richard Levitte
Browse files

Remove some unused PEM structures 



Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2797)
parent 5a81a050

include/openssl/pem.h

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

util/indent.pro

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