resolve conflicts

1 files changed, 3 insertions, 2 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index 5d268eb768..20bd9bda19 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -109,10 +109,11 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
 {
         void *ext_str = NULL;
         char *value = NULL;
-        unsigned char *p;
+        const unsigned char *p;
         X509V3_EXT_METHOD *method;      
         STACK_OF(CONF_VALUE) *nval = NULL;
         int ok = 1;
+
         if(!(method = X509V3_EXT_get(ext)))
                 return unknown_ext_print(out, ext, flag, indent, 0);
         p = ext->value->data;
@@ -182,7 +183,7 @@ int X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts
                 obj=X509_EXTENSION_get_object(ex);
                 i2a_ASN1_OBJECT(bp,obj);
                 j=X509_EXTENSION_get_critical(ex);
-                if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
+                if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
                         return 0;
                 if(!X509V3_EXT_print(bp, ex, flag, indent + 4))
                         {