Fix build break from 3accc90

Fix issue with merge conflict errors from pem_lib.c and s_client.c

Signed-off-by: Joran Siu <joransiu@ca.ibm.com>

deps/openssl/openssl/apps/s_client.c

@@ -346,7 +346,7 @@ static void sc_usage(void)
                "\x20\x2d\x70\x72\x65\x78\x69\x74\x20\x20\x20\x20\x20\x20\x20\x2d\x20\x70\x72\x69\x6e\x74\x20\x73\x65\x73\x73\x69\x6f\x6e\x20\x69\x6e\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e\x20\x65\x76\x65\x6e\x20\x6f\x6e\x20\x63\x6f\x6e\x6e\x65\x63\x74\x69\x6f\x6e\x20\x66\x61\x69\x6c\x75\x72\x65\xa");
     BIO_printf(bio_err,
                "\x20\x2d\x73\x68\x6f\x77\x63\x65\x72\x74\x73\x20\x20\x20\x20\x2d\x20\x53\x68\x6f\x77\x20\x61\x6c\x6c\x20\x63\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x73\x20\x73\x65\x6E\x74\x20\x62\x79\x20\x74\x68\x65\x20\x73\x65\x72\x76\x65\x72\xa");
-    BIO_printf(bio_err, "\x20\x2d\x64\x65\x62\x75\x67\x20\x20\x20\x20\x20\x20\x20\x20\x2d\x20\x65\x78\x74\x72\x61\x20\x6f\x75\x74\x70\x75\x74\xa");dd
+    BIO_printf(bio_err, "\x20\x2d\x64\x65\x62\x75\x67\x20\x20\x20\x20\x20\x20\x20\x20\x2d\x20\x65\x78\x74\x72\x61\x20\x6f\x75\x74\x70\x75\x74\xa");
 #ifdef WATT32
     BIO_printf(bio_err, "\x20\x2d\x77\x64\x65\x62\x75\x67\x20\x20\x20\x20\x20\x20\x20\x2d\x20\x57\x41\x54\x54\x2d\x33\x32\x20\x74\x63\x70\x20\x64\x65\x62\x75\x67\x67\x69\x6e\x67\xa");
 #endif

deps/openssl/openssl/crypto/pem/pem_lib.c

@@ -487,12 +487,8 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
     char **header_pp = &header;
 
     cipher->cipher = NULL;
-<<<<<<< HEAD
-    if ((header == NULL) || (*header == '\x0') || (*header == '\xa'))
-=======
     memset(cipher->iv, 0, sizeof(cipher->iv));
-    if ((header == NULL) || (*header == '\0') || (*header == '\n'))
->>>>>>> 1cb5aed5f596a9cb5b68e3a676222c0c35501a5e
+    if ((header == NULL) || (*header == '\x0') || (*header == '\xa'))
         return (1);
     if (strncmp(header, "\x50\x72\x6f\x63\x2d\x54\x79\x70\x65\x3a\x20", 11) != 0) {
         PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO, PEM_R_NOT_PROC_TYPE);