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

make X509_CERT_AUX opaque 



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

crypto/asn1/t_x509a.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <openssl/evp.h>

#include <openssl/asn1.h>

#include <openssl/x509.h>

#include "internal/x509_int.h"



/*

 * X509_CERT_AUX and string set routines

crypto/asn1/x_x509a.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <openssl/evp.h>

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#include "internal/x509_int.h"



/*

 * X509_CERT_AUX routines. These are used to encode additional user

crypto/include/internal/x509_int.h

+14 −0
Original line number Diff line number Diff line
@@ -75,3 +75,17 @@ struct X509_name_st { 
    unsigned char *canon_enc;

    int canon_enclen;

} /* X509_NAME */ ;



/*

 * This stuff is certificate "auxiliary info" it contains details which are

 * useful in certificate stores and databases. When used this is tagged onto

 * the end of the certificate itself

 */



struct x509_cert_aux_st {

    STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */

    STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */

    ASN1_UTF8STRING *alias;     /* "friendly name" */

    ASN1_OCTET_STRING *keyid;   /* key id of private key */

    STACK_OF(X509_ALGOR) *other; /* other unspecified info */

};

crypto/x509/x509_trs.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/x509v3.h>

#include "internal/x509_int.h"



static int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b);

static void trtable_free(X509_TRUST *p);

include/openssl/x509.h

+1 −13
Original line number Diff line number Diff line
@@ -196,19 +196,7 @@ typedef struct x509_cinf_st { 
    ASN1_ENCODING enc;

} X509_CINF;



/*

 * This stuff is certificate "auxiliary info" it contains details which are

 * useful in certificate stores and databases. When used this is tagged onto

 * the end of the certificate itself

 */



typedef struct x509_cert_aux_st {

    STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */

    STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */

    ASN1_UTF8STRING *alias;     /* "friendly name" */

    ASN1_OCTET_STRING *keyid;   /* key id of private key */

    STACK_OF(X509_ALGOR) *other; /* other unspecified info */

} X509_CERT_AUX;

typedef struct x509_cert_aux_st X509_CERT_AUX;



struct x509_st {

    X509_CINF *cert_info;