mirror of
https://github.com/openssl/openssl.git
synced 2025-02-23 14:42:15 +08:00
Ignore the serial number for now and just do the rest.
Reviewed-by: Stephen Henson <steve@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1367)
This commit is contained in:
parent
1421aeadd7
commit
22293ea1cc
@ -980,14 +980,14 @@ end_of_options:
|
|||||||
if (verbose)
|
if (verbose)
|
||||||
BIO_printf(bio_err, "writing new certificates\n");
|
BIO_printf(bio_err, "writing new certificates\n");
|
||||||
for (i = 0; i < sk_X509_num(cert_sk); i++) {
|
for (i = 0; i < sk_X509_num(cert_sk); i++) {
|
||||||
const ASN1_INTEGER *serialNumber = X509_get_serialNumber(x);
|
ASN1_INTEGER *serialNumber = X509_get_serialNumber(x);
|
||||||
int k;
|
int k;
|
||||||
char *n;
|
char *n;
|
||||||
|
|
||||||
x = sk_X509_value(cert_sk, i);
|
x = sk_X509_value(cert_sk, i);
|
||||||
|
|
||||||
j = ASN1_STRING_length(serialNumber);
|
j = ASN1_STRING_length(serialNumber);
|
||||||
p = (const char *)ASN1_STRING_data((ASN1_INTEGER *)serialNumber);
|
p = (const char *)ASN1_STRING_data(serialNumber);
|
||||||
|
|
||||||
if (strlen(outdir) >= (size_t)(j ? BSIZE - j * 2 - 6 : BSIZE - 8)) {
|
if (strlen(outdir) >= (size_t)(j ? BSIZE - j * 2 - 6 : BSIZE - 8)) {
|
||||||
BIO_printf(bio_err, "certificate file name too long\n");
|
BIO_printf(bio_err, "certificate file name too long\n");
|
||||||
@ -1685,7 +1685,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
|
|||||||
goto end;
|
goto end;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (BN_to_ASN1_INTEGER(serial, (ASN1_INTEGER *)X509_get_serialNumber(ret)) == NULL)
|
if (BN_to_ASN1_INTEGER(serial, X509_get_serialNumber(ret)) == NULL)
|
||||||
goto end;
|
goto end;
|
||||||
if (selfsign) {
|
if (selfsign) {
|
||||||
if (!X509_set_issuer_name(ret, subject))
|
if (!X509_set_issuer_name(ret, subject))
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer)
|
OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer)
|
||||||
{
|
{
|
||||||
X509_NAME *iname;
|
X509_NAME *iname;
|
||||||
const ASN1_INTEGER *serial;
|
ASN1_INTEGER *serial;
|
||||||
ASN1_BIT_STRING *ikey;
|
ASN1_BIT_STRING *ikey;
|
||||||
if (!dgst)
|
if (!dgst)
|
||||||
dgst = EVP_sha1();
|
dgst = EVP_sha1();
|
||||||
@ -40,7 +40,7 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer)
|
|||||||
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
|
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
|
||||||
X509_NAME *issuerName,
|
X509_NAME *issuerName,
|
||||||
ASN1_BIT_STRING *issuerKey,
|
ASN1_BIT_STRING *issuerKey,
|
||||||
const ASN1_INTEGER *serialNumber)
|
ASN1_INTEGER *serialNumber)
|
||||||
{
|
{
|
||||||
int nid;
|
int nid;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -102,7 +102,7 @@ X509_NAME *X509_get_subject_name(const X509 *a)
|
|||||||
return (a->cert_info.subject);
|
return (a->cert_info.subject);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ASN1_INTEGER *X509_get_serialNumber(const X509 *a)
|
ASN1_INTEGER *X509_get_serialNumber(X509 *a)
|
||||||
{
|
{
|
||||||
return &a->cert_info.serialNumber;
|
return &a->cert_info.serialNumber;
|
||||||
}
|
}
|
||||||
|
@ -187,7 +187,7 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
|
|||||||
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
|
OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
|
||||||
X509_NAME *issuerName,
|
X509_NAME *issuerName,
|
||||||
ASN1_BIT_STRING *issuerKey,
|
ASN1_BIT_STRING *issuerKey,
|
||||||
const ASN1_INTEGER *serialNumber);
|
ASN1_INTEGER *serialNumber);
|
||||||
|
|
||||||
OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
|
OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
|
||||||
|
|
||||||
|
@ -612,7 +612,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
|
|||||||
long X509_get_version(const X509 *x);
|
long X509_get_version(const X509 *x);
|
||||||
int X509_set_version(X509 *x, long version);
|
int X509_set_version(X509 *x, long version);
|
||||||
int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
|
int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
|
||||||
const ASN1_INTEGER *X509_get_serialNumber(const X509 *x);
|
ASN1_INTEGER *X509_get_serialNumber(X509 *x);
|
||||||
int X509_set_issuer_name(X509 *x, X509_NAME *name);
|
int X509_set_issuer_name(X509 *x, X509_NAME *name);
|
||||||
X509_NAME *X509_get_issuer_name(const X509 *a);
|
X509_NAME *X509_get_issuer_name(const X509 *a);
|
||||||
int X509_set_subject_name(X509 *x, X509_NAME *name);
|
int X509_set_subject_name(X509 *x, X509_NAME *name);
|
||||||
|
Loading…
Reference in New Issue
Block a user