generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: previously the serial number file could turn negative

Browse Source 
because an incompletely initialized ASN1_INTEGER was used.
This commit is contained in:
Bodo Möller 2001-03-08 19:13:24 +00:00
parent b72ff47037
commit a75d8bebd2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/x509.c
View File

@ -1030,9 +1030,10 @@ static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create)
{ {
char *buf = NULL, *p; char *buf = NULL, *p;
MS_STATIC char buf2[1024]; MS_STATIC char buf2[1024];
ASN1_INTEGER *bs = NULL, bs2; ASN1_INTEGER *bs = NULL, *bs2 = NULL;
BIO *io = NULL; BIO *io = NULL;
BIGNUM *serial = NULL; BIGNUM *serial = NULL;
buf=OPENSSL_malloc( ((serialfile == NULL) buf=OPENSSL_malloc( ((serialfile == NULL)
?(strlen(CAfile)+strlen(POSTFIX)+1) ?(strlen(CAfile)+strlen(POSTFIX)+1)
:(strlen(serialfile)))+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)) if (!BN_add_word(serial,1))
{ BIO_printf(bio_err,"add_word failure\n"); goto end; } { BIO_printf(bio_err,"add_word failure\n"); goto end; }
bs2.data=(unsigned char *)buf2; if (!(bs2 = BN_to_ASN1_INTEGER(serial, NULL)))
bs2.length=BN_bn2bin(serial,bs2.data); { BIO_printf(bio_err,"error converting bn 2 asn1_integer\n"); goto end; }
if (BIO_write_filename(io,buf) <= 0) if (BIO_write_filename(io,buf) <= 0)
{ {
BIO_printf(bio_err,"error attempting to write serial number file\n"); BIO_printf(bio_err,"error attempting to write serial number file\n");
perror(buf); perror(buf);
goto end; goto end;
} }
i2a_ASN1_INTEGER(io,&bs2); i2a_ASN1_INTEGER(io,bs2);
BIO_puts(io,"\n"); BIO_puts(io,"\n");
BIO_free(io); BIO_free(io);
if (buf) OPENSSL_free(buf);
ASN1_INTEGER_free(bs2);
BN_free(serial);
io=NULL; io=NULL;
return bs; return bs;
end: end:
if (buf) OPENSSL_free(buf);
BIO_free(io); BIO_free(io);
ASN1_INTEGER_free(bs); ASN1_INTEGER_free(bs);
BN_free(serial); BN_free(serial);
@ -1277,6 +1282,3 @@ static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt)
} }
return 1; return 1;
} }