diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
| commit | 96de7a4399a8c71cbb70d6252fa77acfd76b3f09 (patch) | |
| tree | e6f6e4aad1952944ccd27e9eb47ea48b9a78dde7 /lib/libcrypto/asn1/t_crl.c | |
| parent | ec7710fe8f10fb624fbc33c0bbad2474e0c26979 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/asn1/t_crl.c')
| -rw-r--r-- | lib/libcrypto/asn1/t_crl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/asn1/t_crl.c b/lib/libcrypto/asn1/t_crl.c index 757c148df81..929b3e59043 100644 --- a/lib/libcrypto/asn1/t_crl.c +++ b/lib/libcrypto/asn1/t_crl.c @@ -72,7 +72,7 @@ int X509_CRL_print_fp(FILE *fp, X509_CRL *x) if ((b=BIO_new(BIO_s_file())) == NULL) { - X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB); + X509err(X509_F_X509_CRL_PRINT_FP,ERR_R_BUF_LIB); return(0); } BIO_set_fp(b,fp,BIO_NOCLOSE); @@ -121,7 +121,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x) r = sk_X509_REVOKED_value(rev, i); BIO_printf(out," Serial Number: "); i2a_ASN1_INTEGER(out,r->serialNumber); - BIO_printf(out,"\n Revocation Date: ",""); + BIO_printf(out,"\n Revocation Date: "); ASN1_TIME_print(out,r->revocationDate); BIO_printf(out,"\n"); X509V3_extensions_print(out, "CRL entry extensions", |