Commit fbf08b79 authored by Rich Salz's avatar Rich Salz
Browse files

Remove X509_PAIR 



Unused type; a pair X509 certificates. Intended for LDAP support.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 6f91b017

crypto/asn1/x_x509a.c

+0 −7
Original line number Diff line number Diff line
@@ -192,10 +192,3 @@ void X509_reject_clear(X509 *x) 
        x->aux->reject = NULL;

    }

}
 


ASN1_SEQUENCE(X509_CERT_PAIR) = {

        ASN1_EXP_OPT(X509_CERT_PAIR, forward, X509, 0),

        ASN1_EXP_OPT(X509_CERT_PAIR, reverse, X509, 1)

} ASN1_SEQUENCE_END(X509_CERT_PAIR)



IMPLEMENT_ASN1_FUNCTIONS(X509_CERT_PAIR)

crypto/ossl_typ.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ typedef struct asn1_sctx_st ASN1_SCTX; 
# ifdef OPENSSL_SYS_WIN32

#  undef X509_NAME

#  undef X509_EXTENSIONS

#  undef X509_CERT_PAIR

#  undef PKCS7_ISSUER_AND_SERIAL

#  undef OCSP_REQUEST

#  undef OCSP_RESPONSE

crypto/pem/pem.h

+0 −2
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ extern "C" { 


# define PEM_STRING_X509_OLD     "X509 CERTIFICATE"

# define PEM_STRING_X509         "CERTIFICATE"

# define PEM_STRING_X509_PAIR    "CERTIFICATE PAIR"

# define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"

# define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"

# define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
@@ -431,7 +430,6 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str); 


DECLARE_PEM_rw(X509, X509)

DECLARE_PEM_rw(X509_AUX, X509)

DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)

DECLARE_PEM_rw(X509_REQ, X509_REQ)

DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)

DECLARE_PEM_rw(X509_CRL, X509_CRL)

crypto/pem/pem_xaux.c

+0 −2
Original line number Diff line number Diff line
@@ -66,5 +66,3 @@ 
#include <openssl/pem.h>



IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
 
IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR,

                 X509_CERT_PAIR)

crypto/x509/x509.h

+0 −8
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ extern "C" { 
# ifdef OPENSSL_SYS_WIN32

/* Under Win32 these are defined in wincrypt.h */

#  undef X509_NAME

#  undef X509_CERT_PAIR

#  undef X509_EXTENSIONS

# endif
@@ -298,11 +297,6 @@ typedef struct x509_trust_st { 


DECLARE_STACK_OF(X509_TRUST)



typedef struct x509_cert_pair_st {

    X509 *forward;

    X509 *reverse;

} X509_CERT_PAIR;



/* standard trust ids */



# define X509_TRUST_DEFAULT      -1/* Only valid in purpose settings */
@@ -799,8 +793,6 @@ DECLARE_ASN1_FUNCTIONS(X509_CINF) 
DECLARE_ASN1_FUNCTIONS(X509)

DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)



DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)



int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,

                          CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);

int X509_set_ex_data(X509 *r, int idx, void *arg);