Ticket #65297: patch-alpine-validate-cert-logging.diff

imap/src/osdep/unix/ssl_unix.c

@@ -553 +553 @@
 #endif /* OPENSSL_1_1_0 */
                                 /* Method 2, use cname */
   if(m == 0 || ret != NIL){
+     char *tmp[MAILTMPLEN];
      cname = X509_get_subject_name(cert);
+     X509_NAME_oneline(cname, buf, sizeof(buf));
+     sprintf(tmp, "ssl_validate_cert(): cert %s, host %s",
+             buf, host ? host : "null");
+     mm_log(tmp, PARSE);
      for(j = 0, ret = NIL; j < X509_NAME_entry_count(cname) && ret == NIL; j++){
         if((e = X509_NAME_get_entry(cname, j)) != NULL){
            X509_NAME_get_text_by_OBJ(cname, X509_NAME_ENTRY_get_object(e), buf, sizeof(buf));
@@ -600 +605 @@
 static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat)
 {
   long ret = NIL;
+  static long entered = 0;
+  ++entered;
   switch (*pat) {
   case '*':                     /* wildcard */
     if (pat[1]) {               /* there must be a pattern suffix */
@@ -615 +622 @@
     if (!compare_uchar (*pat,*s)) ret = ssl_compare_hostnames (s+1,pat+1);
     break;
   }
+  if (entered == 1) {
+    char *tmp[MAILTMPLEN];
+    sprintf(tmp, "ssl_compare_hostnames(): s %s, pat %s, ret %li",
+            s ? s : (unsigned char *) "null",
+            pat ? pat : (unsigned char *) "null", ret);
+    mm_log(tmp, PARSE);
+  }
+  --entered;
   return ret;
 }