diff lib/sslcommon.c @ 970:4c7a58ef26c1

2008-11-30 Brian Masney <[e-mail]> * src/gtk/delete_dialog.c - fixed call to g_strdup_printf() where too many arguments were passed in format string. * lib/sslcommon.c - removed duplicate data variable * src/uicommon/gftpui.c (gftpui_common_cmd_help) - fixed call to strncat() where the supplied length was too long

--- a/lib/sslcommon.c	Sun Nov 30 14:41:36 2008 +0000
+++ b/lib/sslcommon.c	Sun Nov 30 17:55:04 2008 +0000
@@ -139,7 +139,6 @@
  
           if (strcmp (extstr, "subjectAltName") == 0)
             {
-              unsigned char  *data;
               STACK_OF(CONF_VALUE) *val;
               CONF_VALUE   *nval;
               X509V3_EXT_METHOD *meth;
@@ -148,16 +147,14 @@
               if (!(meth = X509V3_EXT_get (ext)))
                 break;
 
-              data = ext->value->data;
-
 #if (OPENSSL_VERSION_NUMBER > 0x00907000L)
               if (meth->it)
-                ext_str = ASN1_item_d2i (NULL, &data, ext->value->length,
+                ext_str = ASN1_item_d2i (NULL, &ext->value->data, ext->value->length,
                                         ASN1_ITEM_ptr (meth->it));
               else
-                ext_str = meth->d2i (NULL, &data, ext->value->length);
+                ext_str = meth->d2i (NULL, &ext->value->data, ext->value->length);
 #else
-              ext_str = meth->d2i(NULL, &data, ext->value->length);
+              ext_str = meth->d2i(NULL, &ext->value->data, ext->value->length);
 #endif
               val = meth->i2v(meth, ext_str, NULL);
 
@@ -179,7 +176,7 @@
     }
 
   if (!ok && (subj = X509_get_subject_name (cert)) &&
-      X509_NAME_get_text_by_NID (subj, NID_commonName, data, 256) > 0)
+      X509_NAME_get_text_by_NID (subj, NID_commonName, data, sizeof (data)) > 0)
     {
       data[sizeof (data) - 1] = '\0';
       /* Check for wildcard CN (must begin with *.) */