diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-16 18:46:16 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-16 22:33:25 +0100 |
| commit | 95ed0e7c1f4206191c1b0288e352010e70e252db (patch) | |
| tree | 69a21e3207ae88e33cf26812dd711081b3e5ee13 /crypto/asn1 | |
| parent | 5cf6abd805b9f15127f9f343a6e3b662565f93d5 (diff) | |
Embed X509_REQ_INFO
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/t_req.c | 4 | ||||
| -rw-r--r-- | crypto/asn1/x_req.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 7d72e0a26f..d9966a3848 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -108,7 +108,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, if (nmflags == X509_FLAG_COMPAT) nmindent = 16; - ri = x->req_info; + ri = &x->req_info; if (!(cflag & X509_FLAG_NO_HEADER)) { if (BIO_write(bp, "Certificate Request:\n", 21) <= 0) goto err; @@ -153,7 +153,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, if (BIO_printf(bp, "%8sAttributes:\n", "") <= 0) goto err; - sk = x->req_info->attributes; + sk = x->req_info.attributes; if (sk_X509_ATTRIBUTE_num(sk) == 0) { if (BIO_printf(bp, "%12sa0:00\n", "") <= 0) goto err; diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index 102b1f6332..bd07d72627 100644 --- a/crypto/asn1/x_req.c +++ b/crypto/asn1/x_req.c @@ -107,7 +107,7 @@ ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = { IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO) ASN1_SEQUENCE_ref(X509_REQ, 0, CRYPTO_LOCK_X509_REQ) = { - ASN1_SIMPLE(X509_REQ, req_info, X509_REQ_INFO), + ASN1_EMBED(X509_REQ, req_info, X509_REQ_INFO), ASN1_SIMPLE(X509_REQ, sig_alg, X509_ALGOR), ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING) } ASN1_SEQUENCE_END_ref(X509_REQ, X509_REQ) |