diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-16 18:40:26 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-16 22:33:25 +0100 |
| commit | 5cf6abd805b9f15127f9f343a6e3b662565f93d5 (patch) | |
| tree | c2200abe313b593158feb34a2a3c6f5ec8498dbc /crypto/x509/by_dir.c | |
| parent | 7aef39a72a2d3a7a2b0e222137a45e1b1406668d (diff) | |
Embed X509_CINF
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509/by_dir.c')
| -rw-r--r-- | crypto/x509/by_dir.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 5f423e0c4a..5241cad639 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -253,10 +253,7 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, { BY_DIR *ctx; union { - struct { - X509 st_x509; - X509_CINF st_x509_cinf; - } x509; + X509 st_x509; X509_CRL crl; } data; int ok = 0; @@ -271,9 +268,8 @@ static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type, stmp.type = type; if (type == X509_LU_X509) { - data.x509.st_x509.cert_info = &data.x509.st_x509_cinf; - data.x509.st_x509_cinf.subject = name; - stmp.data.x509 = &data.x509.st_x509; + data.st_x509.cert_info.subject = name; + stmp.data.x509 = &data.st_x509; postfix = ""; } else if (type == X509_LU_CRL) { data.crl.crl.issuer = name; |