net/asterisk-13.x/patches/100-AST-2015-003-13.diff

   1 --- a/main/tcptls.c
   2 +++ b/main/tcptls.c
   3 @@ -640,9 +640,15 @@
   4                                                         break;
   5                                                 }
   6                                                 str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos));
   7 -                                               ASN1_STRING_to_UTF8(&str2, str);
   8 +                                               ret = ASN1_STRING_to_UTF8(&str2, str);
   9 +                                               if (ret < 0) {
  10 +                                                       continue;
  11 +                                               }
  12 +
  13                                                 if (str2) {
  14 -                                                       if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
  15 +                                                       if (strlen((char *) str2) != ret) {
  16 +                                                               ast_log(LOG_WARNING, "Invalid certificate common name length (contains NULL bytes?)\n");
  17 +                                                       } else if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) {
  18                                                                 found = 1;
  19                                                         }
  20                                                         ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2);