Commit b5f07d6a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove obsolete declarations. 



Remove DECLARE_ASN1_SET_OF and DECLARE_PKCS12_STACK_OF these haven't been
used internally in OpenSSL for some time.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f9c850c7

crypto/asn1/asn1.h

+0 −5
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ extern "C" { 
    struct X509_algor_st;

DECLARE_STACK_OF(X509_ALGOR)



# define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */



/*

 * We MUST make sure that, except for constness, asn1_ctx_st and

 * asn1_const_ctx are exactly the same.  Fortunately, as soon as the old ASN1
@@ -521,7 +519,6 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void); 
                                ASN1_STRFLGS_DUMP_DER)



DECLARE_STACK_OF(ASN1_INTEGER)

DECLARE_ASN1_SET_OF(ASN1_INTEGER)



DECLARE_STACK_OF(ASN1_GENERALSTRING)
@@ -557,7 +554,6 @@ typedef struct asn1_type_st { 
} ASN1_TYPE;



DECLARE_STACK_OF(ASN1_TYPE)

DECLARE_ASN1_SET_OF(ASN1_TYPE)



typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
@@ -795,7 +791,6 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, 
DECLARE_ASN1_ITEM(ASN1_OBJECT)



DECLARE_STACK_OF(ASN1_OBJECT)

DECLARE_ASN1_SET_OF(ASN1_OBJECT)



ASN1_STRING *ASN1_STRING_new(void);

void ASN1_STRING_free(ASN1_STRING *a);

crypto/ocsp/ocsp.h

+0 −2
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ DECLARE_STACK_OF(OCSP_CERTID) 
typedef struct ocsp_one_request_st OCSP_ONEREQ;



DECLARE_STACK_OF(OCSP_ONEREQ)

DECLARE_ASN1_SET_OF(OCSP_ONEREQ)



typedef struct ocsp_req_info_st OCSP_REQINFO;

typedef struct ocsp_signature_st OCSP_SIGNATURE;
@@ -131,7 +130,6 @@ typedef struct ocsp_cert_status_st OCSP_CERTSTATUS; 
typedef struct ocsp_single_response_st OCSP_SINGLERESP;



DECLARE_STACK_OF(OCSP_SINGLERESP)

DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)



typedef struct ocsp_response_data_st OCSP_RESPDATA;

crypto/ossl_typ.h

+0 −4
Original line number Diff line number Diff line
@@ -188,10 +188,6 @@ typedef struct DIST_POINT_st DIST_POINT; 
typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;

typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;



  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */

# define DECLARE_PKCS12_STACK_OF(type)/* Nothing */

# define IMPLEMENT_PKCS12_STACK_OF(type)/* Nothing */



typedef struct crypto_ex_data_st CRYPTO_EX_DATA;

/* Callback types for crypto.h */

typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,

crypto/pkcs12/p12_decr.c

+0 −2
Original line number Diff line number Diff line
@@ -198,5 +198,3 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, 
        ASN1_OCTET_STRING_free(oct);

    return NULL;

}
 


IMPLEMENT_PKCS12_STACK_OF(PKCS7)

crypto/pkcs12/pkcs12.h

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ typedef struct { 
} PKCS12_SAFEBAG;



DECLARE_STACK_OF(PKCS12_SAFEBAG)

DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)

DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)



typedef struct pkcs12_bag_st {

    ASN1_OBJECT *type;