Remove X509_PAIR

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

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index 83fb299daaf6d0b8dad37e58d8b3e672cf8837c0..2a2ca87178173e78887c065d1395bcaa5da657f1 100644 (file)
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -192,10 +192,3 @@ void X509_reject_clear(X509 *x)
         x->aux->reject = NULL;
     }
 }
         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)

diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index 1cf0a5cd5a9c88661ac50b2cd377fdd66afe4d46..a75f3d775fc947f0d2519e930635ccddd9c8d792 100644 (file)
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
@@ -109,7 +109,6 @@ typedef struct asn1_sctx_st ASN1_SCTX;
 # ifdef OPENSSL_SYS_WIN32
 #  undef X509_NAME
 #  undef X509_EXTENSIONS
 # 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
 #  undef PKCS7_ISSUER_AND_SERIAL
 #  undef OCSP_REQUEST
 #  undef OCSP_RESPONSE

diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index d8057cbaa07eb91745f54da66d78e53eb05cb6c5..d42e5b00814e590214d1dd5bc6f50e9294364d98 100644 (file)
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -109,7 +109,6 @@ extern "C" {
 
 # define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
 # define PEM_STRING_X509         "CERTIFICATE"
 
 # 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"
 # 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, 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)
 DECLARE_PEM_rw(X509_REQ, X509_REQ)
 DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
 DECLARE_PEM_rw(X509_CRL, X509_CRL)

diff --git a/crypto/pem/pem_xaux.c b/crypto/pem/pem_xaux.c
index c5234301898da2fa42abc028ecb693b55ce50458..3263bd61c51e9b9268381a18d901bfbbea9e02ef 100644 (file)
--- a/crypto/pem/pem_xaux.c
+++ b/crypto/pem/pem_xaux.c
@@ -66,5 +66,3 @@
 #include <openssl/pem.h>
 
 IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
 #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)

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index fae320f9f3991448b3a7c6c9dfe3f76c9339458b..1e78e30f5ef20fe5d03a9d3375655ed4e4e26066 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -107,7 +107,6 @@ extern "C" {
 # ifdef OPENSSL_SYS_WIN32
 /* Under Win32 these are defined in wincrypt.h */
 #  undef X509_NAME
 # ifdef OPENSSL_SYS_WIN32
 /* Under Win32 these are defined in wincrypt.h */
 #  undef X509_NAME

-#  undef X509_CERT_PAIR

 #  undef X509_EXTENSIONS
 # endif
 
 #  undef X509_EXTENSIONS
 # endif
 


@@ -298,11 +297,6 @@ typedef struct x509_trust_st {
 
 DECLARE_STACK_OF(X509_TRUST)
 
 
 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 */
 /* 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)
 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);
 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);

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index a99d71bdc6d2d0aab476d56483942156515709d3..d1cd6d3a1cfcdbaa28007773bfdf823edd5fdde6 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -70,7 +70,6 @@ extern "C" {
 # ifdef OPENSSL_SYS_WIN32
 /* Under Win32 these are defined in wincrypt.h */
 #  undef X509_NAME
 # ifdef OPENSSL_SYS_WIN32
 /* Under Win32 these are defined in wincrypt.h */
 #  undef X509_NAME

-#  undef X509_CERT_PAIR

 #  undef X509_EXTENSIONS
 # endif
 
 #  undef X509_EXTENSIONS
 # endif
 

diff --git a/engines/e_capi.c b/engines/e_capi.c
index a6824d3884e01fdb52118f7536776949db5d496d..f280397ad8167f8dd022c86d64ea714c7c059b8f 100644 (file)
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -100,7 +100,6 @@
 #ifdef __COMPILE_CAPIENG
 
 # undef X509_EXTENSIONS
 #ifdef __COMPILE_CAPIENG
 
 # undef X509_EXTENSIONS

-# undef X509_CERT_PAIR

 
 /* Definitions which may be missing from earlier version of headers */
 # ifndef CERT_STORE_OPEN_EXISTING_FLAG
 
 /* Definitions which may be missing from earlier version of headers */
 # ifndef CERT_STORE_OPEN_EXISTING_FLAG