diff options
| author | Bodo Möller <bodo@openssl.org> | 2001-03-08 19:13:24 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2001-03-08 19:13:24 +0000 |
| commit | a75d8bebd24f1a0f5560131a2c9c49b65a8a4e94 (patch) | |
| tree | 4dcba670bb32888283b0671e9f5694ef51a41538 /apps | |
| parent | b72ff47037804dfbe5ed884c59a68de6fe475821 (diff) | |
Bugfix: previously the serial number file could turn negative
because an incompletely initialized ASN1_INTEGER was used.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/x509.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/x509.c b/apps/x509.c index 658afcef5e..391bb3eef9 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -1030,9 +1030,10 @@ static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create) { char *buf = NULL, *p; MS_STATIC char buf2[1024]; - ASN1_INTEGER *bs = NULL, bs2; + ASN1_INTEGER *bs = NULL, *bs2 = NULL; BIO *io = NULL; BIGNUM *serial = NULL; + buf=OPENSSL_malloc( ((serialfile == NULL) ?(strlen(CAfile)+strlen(POSTFIX)+1) :(strlen(serialfile)))+1); @@ -1099,22 +1100,26 @@ static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create) if (!BN_add_word(serial,1)) { BIO_printf(bio_err,"add_word failure\n"); goto end; } - bs2.data=(unsigned char *)buf2; - bs2.length=BN_bn2bin(serial,bs2.data); - + if (!(bs2 = BN_to_ASN1_INTEGER(serial, NULL))) + { BIO_printf(bio_err,"error converting bn 2 asn1_integer\n"); goto end; } if (BIO_write_filename(io,buf) <= 0) { BIO_printf(bio_err,"error attempting to write serial number file\n"); perror(buf); goto end; } - i2a_ASN1_INTEGER(io,&bs2); + i2a_ASN1_INTEGER(io,bs2); BIO_puts(io,"\n"); + BIO_free(io); + if (buf) OPENSSL_free(buf); + ASN1_INTEGER_free(bs2); + BN_free(serial); io=NULL; return bs; end: + if (buf) OPENSSL_free(buf); BIO_free(io); ASN1_INTEGER_free(bs); BN_free(serial); @@ -1277,6 +1282,3 @@ static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt) } return 1; } - - - |