generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make X509_CERT_AUX opaque

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-08-31 12:16:52 +01:00
parent d8c054f2da
commit bc3686dfb0
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/asn1/t_x509a.c
View File

@ -62,6 +62,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include "internal/x509_int.h"
/* /*
* X509_CERT_AUX and string set routines * X509_CERT_AUX and string set routines

1
crypto/asn1/x_x509a.c
View File

@ -62,6 +62,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include "internal/x509_int.h"
/* /*
* X509_CERT_AUX routines. These are used to encode additional user * X509_CERT_AUX routines. These are used to encode additional user

14
crypto/include/internal/x509_int.h
View File

@ -75,3 +75,17 @@ struct X509_name_st {
unsigned char *canon_enc; unsigned char *canon_enc;
int canon_enclen; int canon_enclen;
} /* X509_NAME */ ; } /* 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 */
};

1
crypto/x509/x509_trs.c
View File

@ -60,6 +60,7 @@
#include <stdio.h> #include <stdio.h>
#include "internal/cryptlib.h" #include "internal/cryptlib.h"
#include <openssl/x509v3.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 int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b);
static void trtable_free(X509_TRUST *p); static void trtable_free(X509_TRUST *p);

14
include/openssl/x509.h
View File

@ -196,19 +196,7 @@ typedef struct x509_cinf_st {
ASN1_ENCODING enc; ASN1_ENCODING enc;
} X509_CINF; } X509_CINF;
/* typedef struct x509_cert_aux_st X509_CERT_AUX;
* 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;
struct x509_st { struct x509_st {
X509_CINF *cert_info; X509_CINF *cert_info;