The branch master has been updated via 95ed0e7c1f4206191c1b0288e352010e70e252db (commit) via 5cf6abd805b9f15127f9f343a6e3b662565f93d5 (commit) from 7aef39a72a2d3a7a2b0e222137a45e1b1406668d (commit)
- Log ----------------------------------------------------------------- commit 95ed0e7c1f4206191c1b0288e352010e70e252db Author: Dr. Stephen Henson <st...@openssl.org> Date: Wed Sep 16 18:46:16 2015 +0100 Embed X509_REQ_INFO Reviewed-by: Rich Salz <rs...@openssl.org> commit 5cf6abd805b9f15127f9f343a6e3b662565f93d5 Author: Dr. Stephen Henson <st...@openssl.org> Date: Wed Sep 16 18:40:26 2015 +0100 Embed X509_CINF Reviewed-by: Rich Salz <rs...@openssl.org> ----------------------------------------------------------------------- Summary of changes: crypto/asn1/t_req.c | 4 +-- crypto/asn1/t_x509.c | 10 ++++---- crypto/asn1/x_req.c | 2 +- crypto/asn1/x_x509.c | 8 +++--- crypto/include/internal/x509_int.h | 2 +- crypto/x509/by_dir.c | 10 +++----- crypto/x509/x509_cmp.c | 50 ++++++++++++++++++-------------------- crypto/x509/x509_ext.c | 18 +++++++------- crypto/x509/x509_lu.c | 4 +-- crypto/x509/x509_r2x.c | 4 +-- crypto/x509/x509_req.c | 30 +++++++++++------------ crypto/x509/x509_set.c | 48 ++++++++++++++++++------------------ crypto/x509/x509rset.c | 16 ++++++------ crypto/x509/x_all.c | 22 ++++++++--------- crypto/x509v3/v3_conf.c | 2 +- crypto/x509v3/v3_skey.c | 4 +-- include/openssl/x509.h | 2 +- 17 files changed, 114 insertions(+), 122 deletions(-) diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 7d72e0a..d9966a3 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/t_x509.c b/crypto/asn1/t_x509.c index 12a9ed4..cebf441 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -122,7 +122,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, if (nmflags == X509_FLAG_COMPAT) nmindent = 16; - ci = x->cert_info; + ci = &x->cert_info; if (!(cflag & X509_FLAG_NO_HEADER)) { if (BIO_write(bp, "Certificate:\n", 13) <= 0) goto err; @@ -272,10 +272,10 @@ int X509_ocspid_print(BIO *bp, X509 *x) */ if (BIO_printf(bp, " Subject OCSP hash: ") <= 0) goto err; - derlen = i2d_X509_NAME(x->cert_info->subject, NULL); + derlen = i2d_X509_NAME(x->cert_info.subject, NULL); if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL) goto err; - i2d_X509_NAME(x->cert_info->subject, &dertmp); + i2d_X509_NAME(x->cert_info.subject, &dertmp); if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL)) goto err; @@ -292,8 +292,8 @@ int X509_ocspid_print(BIO *bp, X509 *x) if (BIO_printf(bp, "\n Public key OCSP hash: ") <= 0) goto err; - if (!EVP_Digest(x->cert_info->key->public_key->data, - x->cert_info->key->public_key->length, + if (!EVP_Digest(x->cert_info.key->public_key->data, + x->cert_info.key->public_key->length, SHA1md, NULL, EVP_sha1(), NULL)) goto err; for (i = 0; i < SHA_DIGEST_LENGTH; i++) { diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index 102b1f6..bd07d72 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) diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index c276874..76dfa35 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -106,7 +106,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, case ASN1_OP_D2I_POST: OPENSSL_free(ret->name); - ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0); + ret->name = X509_NAME_oneline(ret->cert_info.subject, NULL, 0); break; case ASN1_OP_FREE_POST: @@ -132,7 +132,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, } ASN1_SEQUENCE_ref(X509, x509_cb, CRYPTO_LOCK_X509) = { - ASN1_SIMPLE(X509, cert_info, X509_CINF), + ASN1_EMBED(X509, cert_info, X509_CINF), ASN1_SIMPLE(X509, sig_alg, X509_ALGOR), ASN1_SIMPLE(X509, signature, ASN1_BIT_STRING) } ASN1_SEQUENCE_END_ref(X509, X509) @@ -209,8 +209,8 @@ int i2d_X509_AUX(X509 *a, unsigned char **pp) int i2d_re_X509_tbs(X509 *x, unsigned char **pp) { - x->cert_info->enc.modified = 1; - return i2d_X509_CINF(x->cert_info, pp); + x->cert_info.enc.modified = 1; + return i2d_X509_CINF(&x->cert_info, pp); } void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, diff --git a/crypto/include/internal/x509_int.h b/crypto/include/internal/x509_int.h index 7c31289..96c15e3 100644 --- a/crypto/include/internal/x509_int.h +++ b/crypto/include/internal/x509_int.h @@ -100,7 +100,7 @@ struct X509_req_info_st { }; struct X509_req_st { - X509_REQ_INFO *req_info; + X509_REQ_INFO req_info; X509_ALGOR *sig_alg; ASN1_BIT_STRING *signature; int references; diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 5f423e0..5241cad 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; diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 1afc7f8..6f8199b 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -68,10 +68,10 @@ int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b) { int i; - X509_CINF *ai, *bi; + const X509_CINF *ai, *bi; - ai = a->cert_info; - bi = b->cert_info; + ai = &a->cert_info; + bi = &b->cert_info; i = ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber); if (i) return (i); @@ -87,15 +87,15 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) char *f; EVP_MD_CTX_init(&ctx); - f = X509_NAME_oneline(a->cert_info->issuer, NULL, 0); + f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0); if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)) goto err; if (!EVP_DigestUpdate(&ctx, (unsigned char *)f, strlen(f))) goto err; OPENSSL_free(f); if (!EVP_DigestUpdate - (&ctx, (unsigned char *)a->cert_info->serialNumber->data, - (unsigned long)a->cert_info->serialNumber->length)) + (&ctx, (unsigned char *)a->cert_info.serialNumber->data, + (unsigned long)a->cert_info.serialNumber->length)) goto err; if (!EVP_DigestFinal_ex(&ctx, &(md[0]), NULL)) goto err; @@ -110,12 +110,12 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) int X509_issuer_name_cmp(const X509 *a, const X509 *b) { - return (X509_NAME_cmp(a->cert_info->issuer, b->cert_info->issuer)); + return (X509_NAME_cmp(a->cert_info.issuer, b->cert_info.issuer)); } int X509_subject_name_cmp(const X509 *a, const X509 *b) { - return (X509_NAME_cmp(a->cert_info->subject, b->cert_info->subject)); + return (X509_NAME_cmp(a->cert_info.subject, b->cert_info.subject)); } int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b) @@ -130,40 +130,40 @@ int X509_CRL_match(const X509_CRL *a, const X509_CRL *b) X509_NAME *X509_get_issuer_name(X509 *a) { - return (a->cert_info->issuer); + return (a->cert_info.issuer); } unsigned long X509_issuer_name_hash(X509 *x) { - return (X509_NAME_hash(x->cert_info->issuer)); + return (X509_NAME_hash(x->cert_info.issuer)); } #ifndef OPENSSL_NO_MD5 unsigned long X509_issuer_name_hash_old(X509 *x) { - return (X509_NAME_hash_old(x->cert_info->issuer)); + return (X509_NAME_hash_old(x->cert_info.issuer)); } #endif X509_NAME *X509_get_subject_name(X509 *a) { - return (a->cert_info->subject); + return (a->cert_info.subject); } ASN1_INTEGER *X509_get_serialNumber(X509 *a) { - return (a->cert_info->serialNumber); + return (a->cert_info.serialNumber); } unsigned long X509_subject_name_hash(X509 *x) { - return (X509_NAME_hash(x->cert_info->subject)); + return (X509_NAME_hash(x->cert_info.subject)); } #ifndef OPENSSL_NO_MD5 unsigned long X509_subject_name_hash_old(X509 *x) { - return (X509_NAME_hash_old(x->cert_info->subject)); + return (X509_NAME_hash_old(x->cert_info.subject)); } #endif @@ -186,12 +186,12 @@ int X509_cmp(const X509 *a, const X509 *b) if (rv) return rv; /* Check for match against stored encoding too */ - if (!a->cert_info->enc.modified && !b->cert_info->enc.modified) { - rv = (int)(a->cert_info->enc.len - b->cert_info->enc.len); + if (!a->cert_info.enc.modified && !b->cert_info.enc.modified) { + rv = (int)(a->cert_info.enc.len - b->cert_info.enc.len); if (rv) return rv; - return memcmp(a->cert_info->enc.enc, b->cert_info->enc.enc, - a->cert_info->enc.len); + return memcmp(a->cert_info.enc.enc, b->cert_info.enc.enc, + a->cert_info.enc.len); } return rv; } @@ -273,15 +273,13 @@ X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name, ASN1_INTEGER *serial) { int i; - X509_CINF cinf; X509 x, *x509 = NULL; if (!sk) return NULL; - x.cert_info = &cinf; - cinf.serialNumber = serial; - cinf.issuer = name; + x.cert_info.serialNumber = serial; + x.cert_info.issuer = name; for (i = 0; i < sk_X509_num(sk); i++) { x509 = sk_X509_value(sk, i); @@ -306,16 +304,16 @@ X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) EVP_PKEY *X509_get_pubkey(X509 *x) { - if ((x == NULL) || (x->cert_info == NULL)) + if (x == NULL) return (NULL); - return (X509_PUBKEY_get(x->cert_info->key)); + return (X509_PUBKEY_get(x->cert_info.key)); } ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x) { if (!x) return NULL; - return x->cert_info->key->public_key; + return x->cert_info.key->public_key; } int X509_check_private_key(X509 *x, EVP_PKEY *k) diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c index 4437d84..5d951f6 100644 --- a/crypto/x509/x509_ext.c +++ b/crypto/x509/x509_ext.c @@ -114,49 +114,49 @@ int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc) int X509_get_ext_count(X509 *x) { - return (X509v3_get_ext_count(x->cert_info->extensions)); + return (X509v3_get_ext_count(x->cert_info.extensions)); } int X509_get_ext_by_NID(X509 *x, int nid, int lastpos) { - return (X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos)); + return (X509v3_get_ext_by_NID(x->cert_info.extensions, nid, lastpos)); } int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos) { - return (X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos)); + return (X509v3_get_ext_by_OBJ(x->cert_info.extensions, obj, lastpos)); } int X509_get_ext_by_critical(X509 *x, int crit, int lastpos) { return (X509v3_get_ext_by_critical - (x->cert_info->extensions, crit, lastpos)); + (x->cert_info.extensions, crit, lastpos)); } X509_EXTENSION *X509_get_ext(X509 *x, int loc) { - return (X509v3_get_ext(x->cert_info->extensions, loc)); + return (X509v3_get_ext(x->cert_info.extensions, loc)); } X509_EXTENSION *X509_delete_ext(X509 *x, int loc) { - return (X509v3_delete_ext(x->cert_info->extensions, loc)); + return (X509v3_delete_ext(x->cert_info.extensions, loc)); } int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc) { - return (X509v3_add_ext(&(x->cert_info->extensions), ex, loc) != NULL); + return (X509v3_add_ext(&(x->cert_info.extensions), ex, loc) != NULL); } void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx) { - return X509V3_get_d2i(x->cert_info->extensions, nid, crit, idx); + return X509V3_get_d2i(x->cert_info.extensions, nid, crit, idx); } int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit, unsigned long flags) { - return X509V3_add1_i2d(&x->cert_info->extensions, nid, value, crit, + return X509V3_add1_i2d(&x->cert_info.extensions, nid, value, crit, flags); } diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 1c08eb0..71a22d0 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -420,7 +420,6 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, int type, { X509_OBJECT stmp; X509 x509_s; - X509_CINF cinf_s; X509_CRL crl_s; int idx; @@ -428,8 +427,7 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, int type, switch (type) { case X509_LU_X509: stmp.data.x509 = &x509_s; - x509_s.cert_info = &cinf_s; - cinf_s.subject = name; + x509_s.cert_info.subject = name; break; case X509_LU_CRL: stmp.data.crl = &crl_s; diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c index 5d576e9..c5c58f5 100644 --- a/crypto/x509/x509_r2x.c +++ b/crypto/x509/x509_r2x.c @@ -78,9 +78,9 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) } /* duplicate the request */ - xi = ret->cert_info; + xi = &ret->cert_info; - if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) { + if (sk_X509_ATTRIBUTE_num(r->req_info.attributes) != 0) { if ((xi->version = ASN1_INTEGER_new()) == NULL) goto err; if (!ASN1_INTEGER_set(xi->version, 2)) diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c index 70e27b8..3433694 100644 --- a/crypto/x509/x509_req.c +++ b/crypto/x509/x509_req.c @@ -81,7 +81,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) goto err; } - ri = ret->req_info; + ri = &ret->req_info; ri->version->length = 1; ri->version->data = OPENSSL_malloc(1); @@ -112,9 +112,9 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req) { - if ((req == NULL) || (req->req_info == NULL)) + if (req == NULL) return (NULL); - return (X509_PUBKEY_get(req->req_info->pubkey)); + return (X509_PUBKEY_get(req->req_info.pubkey)); } int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) @@ -195,7 +195,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req) int idx, *pnid; const unsigned char *p; - if ((req == NULL) || (req->req_info == NULL) || !ext_nids) + if ((req == NULL) || !ext_nids) return (NULL); for (pnid = ext_nids; *pnid != NID_undef; pnid++) { idx = X509_REQ_get_attr_by_NID(req, *pnid, -1); @@ -244,33 +244,33 @@ int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) int X509_REQ_get_attr_count(const X509_REQ *req) { - return X509at_get_attr_count(req->req_info->attributes); + return X509at_get_attr_count(req->req_info.attributes); } int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos) { - return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos); + return X509at_get_attr_by_NID(req->req_info.attributes, nid, lastpos); } int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj, int lastpos) { - return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos); + return X509at_get_attr_by_OBJ(req->req_info.attributes, obj, lastpos); } X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc) { - return X509at_get_attr(req->req_info->attributes, loc); + return X509at_get_attr(req->req_info.attributes, loc); } X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc) { - return X509at_delete_attr(req->req_info->attributes, loc); + return X509at_delete_attr(req->req_info.attributes, loc); } int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) { - if (X509at_add1_attr(&req->req_info->attributes, attr)) + if (X509at_add1_attr(&req->req_info.attributes, attr)) return 1; return 0; } @@ -279,7 +279,7 @@ int X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len) { - if (X509at_add1_attr_by_OBJ(&req->req_info->attributes, obj, + if (X509at_add1_attr_by_OBJ(&req->req_info.attributes, obj, type, bytes, len)) return 1; return 0; @@ -289,7 +289,7 @@ int X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, const unsigned char *bytes, int len) { - if (X509at_add1_attr_by_NID(&req->req_info->attributes, nid, + if (X509at_add1_attr_by_NID(&req->req_info.attributes, nid, type, bytes, len)) return 1; return 0; @@ -299,7 +299,7 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, const unsigned char *bytes, int len) { - if (X509at_add1_attr_by_txt(&req->req_info->attributes, attrname, + if (X509at_add1_attr_by_txt(&req->req_info.attributes, attrname, type, bytes, len)) return 1; return 0; @@ -307,10 +307,10 @@ int X509_REQ_add1_attr_by_txt(X509_REQ *req, long X509_REQ_get_version(X509_REQ *req) { - return ASN1_INTEGER_get(req->req_info->version); + return ASN1_INTEGER_get(req->req_info.version); } X509_NAME *X509_REQ_get_subject_name(X509_REQ *req) { - return req->req_info->subject; + return req->req_info.subject; } diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 0b0d4f5..b5209f2 100644 --- a/crypto/x509/x509_set.c +++ b/crypto/x509/x509_set.c @@ -68,15 +68,15 @@ int X509_set_version(X509 *x, long version) if (x == NULL) return (0); if (version == 0) { - ASN1_INTEGER_free(x->cert_info->version); - x->cert_info->version = NULL; + ASN1_INTEGER_free(x->cert_info.version); + x->cert_info.version = NULL; return (1); } - if (x->cert_info->version == NULL) { - if ((x->cert_info->version = ASN1_INTEGER_new()) == NULL) + if (x->cert_info.version == NULL) { + if ((x->cert_info.version = ASN1_INTEGER_new()) == NULL) return (0); } - return (ASN1_INTEGER_set(x->cert_info->version, version)); + return (ASN1_INTEGER_set(x->cert_info.version, version)); } int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial) @@ -85,12 +85,12 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial) if (x == NULL) return (0); - in = x->cert_info->serialNumber; + in = x->cert_info.serialNumber; if (in != serial) { in = ASN1_INTEGER_dup(serial); if (in != NULL) { - ASN1_INTEGER_free(x->cert_info->serialNumber); - x->cert_info->serialNumber = in; + ASN1_INTEGER_free(x->cert_info.serialNumber); + x->cert_info.serialNumber = in; } } return (in != NULL); @@ -98,16 +98,16 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial) int X509_set_issuer_name(X509 *x, X509_NAME *name) { - if ((x == NULL) || (x->cert_info == NULL)) + if (x == NULL) return (0); - return (X509_NAME_set(&x->cert_info->issuer, name)); + return (X509_NAME_set(&x->cert_info.issuer, name)); } int X509_set_subject_name(X509 *x, X509_NAME *name) { - if ((x == NULL) || (x->cert_info == NULL)) + if (x == NULL) return (0); - return (X509_NAME_set(&x->cert_info->subject, name)); + return (X509_NAME_set(&x->cert_info.subject, name)); } int X509_set_notBefore(X509 *x, const ASN1_TIME *tm) @@ -116,12 +116,12 @@ int X509_set_notBefore(X509 *x, const ASN1_TIME *tm) if (x == NULL) return (0); - in = x->cert_info->validity.notBefore; + in = x->cert_info.validity.notBefore; if (in != tm) { in = ASN1_STRING_dup(tm); if (in != NULL) { - ASN1_TIME_free(x->cert_info->validity.notBefore); - x->cert_info->validity.notBefore = in; + ASN1_TIME_free(x->cert_info.validity.notBefore); + x->cert_info.validity.notBefore = in; } } return (in != NULL); @@ -133,12 +133,12 @@ int X509_set_notAfter(X509 *x, const ASN1_TIME *tm) if (x == NULL) return (0); - in = x->cert_info->validity.notAfter; + in = x->cert_info.validity.notAfter; if (in != tm) { in = ASN1_STRING_dup(tm); if (in != NULL) { - ASN1_TIME_free(x->cert_info->validity.notAfter); - x->cert_info->validity.notAfter = in; + ASN1_TIME_free(x->cert_info.validity.notAfter); + x->cert_info.validity.notAfter = in; } } return (in != NULL); @@ -146,9 +146,9 @@ int X509_set_notAfter(X509 *x, const ASN1_TIME *tm) int X509_set_pubkey(X509 *x, EVP_PKEY *pkey) { - if ((x == NULL) || (x->cert_info == NULL)) + if (x == NULL) return (0); - return (X509_PUBKEY_set(&(x->cert_info->key), pkey)); + return (X509_PUBKEY_set(&(x->cert_info.key), pkey)); } void X509_up_ref(X509 *x) @@ -158,17 +158,17 @@ void X509_up_ref(X509 *x) long X509_get_version(X509 *x) { - return ASN1_INTEGER_get(x->cert_info->version); + return ASN1_INTEGER_get(x->cert_info.version); } ASN1_TIME * X509_get_notBefore(X509 *x) { - return x->cert_info->validity.notBefore; + return x->cert_info.validity.notBefore; } ASN1_TIME *X509_get_notAfter(X509 *x) { - return x->cert_info->validity.notAfter; + return x->cert_info.validity.notAfter; } int X509_get_signature_type(const X509 *x) @@ -178,5 +178,5 @@ int X509_get_signature_type(const X509 *x) X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x) { - return x->cert_info->key; + return x->cert_info.key; } diff --git a/crypto/x509/x509rset.c b/crypto/x509/x509rset.c index cf9bdfb..817400c 100644 --- a/crypto/x509/x509rset.c +++ b/crypto/x509/x509rset.c @@ -68,22 +68,22 @@ int X509_REQ_set_version(X509_REQ *x, long version) { if (x == NULL) return (0); - x->req_info->enc.modified = 1; - return (ASN1_INTEGER_set(x->req_info->version, version)); + x->req_info.enc.modified = 1; + return (ASN1_INTEGER_set(x->req_info.version, version)); } int X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name) { - if ((x == NULL) || (x->req_info == NULL)) + if (x == NULL) return (0); - x->req_info->enc.modified = 1; - return (X509_NAME_set(&x->req_info->subject, name)); + x->req_info.enc.modified = 1; + return (X509_NAME_set(&x->req_info.subject, name)); } int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey) { - if ((x == NULL) || (x->req_info == NULL)) + if (x == NULL) return (0); - x->req_info->enc.modified = 1; - return (X509_PUBKEY_set(&x->req_info->pubkey, pkey)); + x->req_info.enc.modified = 1; + return (X509_PUBKEY_set(&x->req_info.pubkey, pkey)); } diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index ab258be..b7f6be1 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -74,16 +74,16 @@ int X509_verify(X509 *a, EVP_PKEY *r) { - if (X509_ALGOR_cmp(a->sig_alg, a->cert_info->signature)) + if (X509_ALGOR_cmp(a->sig_alg, a->cert_info.signature)) return 0; return (ASN1_item_verify(ASN1_ITEM_rptr(X509_CINF), a->sig_alg, - a->signature, a->cert_info, r)); + a->signature, &a->cert_info, r)); } int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) { return (ASN1_item_verify(ASN1_ITEM_rptr(X509_REQ_INFO), - a->sig_alg, a->signature, a->req_info, r)); + a->sig_alg, a->signature, &a->req_info, r)); } int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) @@ -94,17 +94,17 @@ int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) { - x->cert_info->enc.modified = 1; - return (ASN1_item_sign(ASN1_ITEM_rptr(X509_CINF), x->cert_info->signature, - x->sig_alg, x->signature, x->cert_info, pkey, md)); + x->cert_info.enc.modified = 1; + return (ASN1_item_sign(ASN1_ITEM_rptr(X509_CINF), x->cert_info.signature, + x->sig_alg, x->signature, &x->cert_info, pkey, md)); } int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) { - x->cert_info->enc.modified = 1; + x->cert_info.enc.modified = 1; return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CINF), - x->cert_info->signature, - x->sig_alg, x->signature, x->cert_info, ctx); + x->cert_info.signature, + x->sig_alg, x->signature, &x->cert_info, ctx); } int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert) @@ -116,13 +116,13 @@ int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert) int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) { return (ASN1_item_sign(ASN1_ITEM_rptr(X509_REQ_INFO), x->sig_alg, NULL, - x->signature, x->req_info, pkey, md)); + x->signature, &x->req_info, pkey, md)); } int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx) { return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_REQ_INFO), - x->sig_alg, NULL, x->signature, x->req_info, + x->sig_alg, NULL, x->signature, &x->req_info, ctx); } diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index 3d5963c..0b6ff4f 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -376,7 +376,7 @@ int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section, { STACK_OF(X509_EXTENSION) **sk = NULL; if (cert) - sk = &cert->cert_info->extensions; + sk = &cert->cert_info.extensions; return X509V3_EXT_add_nconf_sk(conf, ctx, section, sk); } diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c index 4b55fd8..cf35213 100644 --- a/crypto/x509v3/v3_skey.c +++ b/crypto/x509v3/v3_skey.c @@ -126,9 +126,9 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, } if (ctx->subject_req) - pk = ctx->subject_req->req_info->pubkey->public_key; + pk = ctx->subject_req->req_info.pubkey->public_key; else - pk = ctx->subject_cert->cert_info->key->public_key; + pk = ctx->subject_cert->cert_info.key->public_key; if (!pk) { X509V3err(X509V3_F_S2I_SKEY_ID, X509V3_R_NO_PUBLIC_KEY); diff --git a/include/openssl/x509.h b/include/openssl/x509.h index d0933b0..c7c81ec 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -181,7 +181,7 @@ typedef struct x509_cinf_st { typedef struct x509_cert_aux_st X509_CERT_AUX; struct x509_st { - X509_CINF *cert_info; + X509_CINF cert_info; X509_ALGOR *sig_alg; ASN1_BIT_STRING *signature; int valid; _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits