resolve conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c
index 757c148df8..929b3e5904 100644
--- a/src/lib/libcrypto/asn1/t_crl.c
+++ b/src/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",