diff -urp gnutls-1.4.1.orig/lib/gnutls_algorithms.c gnutls-1.4.1/lib/gnutls_algorithms.c
--- gnutls-1.4.1.orig/lib/gnutls_algorithms.c	2012-01-29 09:21:29.000000000 -0500
+++ gnutls-1.4.1/lib/gnutls_algorithms.c	2012-01-29 09:34:00.000000000 -0500
@@ -570,7 +570,7 @@ _gnutls_x509_oid2mac_algorithm (const ch
 {
   gnutls_mac_algorithm_t ret = 0;
 
-  GNUTLS_HASH_LOOP (if (strcmp (oid, p->oid) == 0)
+  GNUTLS_HASH_LOOP (if (p->oid && strcmp (oid, p->oid) == 0)
 		    {
 		    ret = p->id; break;}
   );
diff -urp gnutls-1.4.1.orig/lib/gnutls_constate.c gnutls-1.4.1/lib/gnutls_constate.c
--- gnutls-1.4.1.orig/lib/gnutls_constate.c	2012-01-29 09:21:29.000000000 -0500
+++ gnutls-1.4.1/lib/gnutls_constate.c	2012-01-29 09:38:41.000000000 -0500
@@ -490,7 +490,7 @@ _gnutls_connection_state_init (gnutls_se
 
 /* Setup the master secret 
  */
-  if ((ret = _gnutls_generate_master (session, 0), 0) < 0)
+  if ((ret = _gnutls_generate_master (session, 0)) < 0)
     {
       gnutls_assert ();
       return ret;
diff -urp gnutls-1.4.1.orig/lib/gnutls_kx.c gnutls-1.4.1/lib/gnutls_kx.c
--- gnutls-1.4.1.orig/lib/gnutls_kx.c	2006-03-08 05:44:59.000000000 -0500
+++ gnutls-1.4.1/lib/gnutls_kx.c	2012-01-29 09:52:57.000000000 -0500
@@ -581,8 +581,7 @@ _gnutls_recv_client_certificate (gnutls_
 
 	  /* certificate was required 
 	   */
-	  if (ret ==
-	      (GNUTLS_E_WARNING_ALERT_RECEIVED
+	  if ((ret == GNUTLS_E_WARNING_ALERT_RECEIVED
 	       || ret == GNUTLS_E_FATAL_ALERT_RECEIVED)
 	      && optional == MANDATORY_PACKET)
 	    {
diff -urp gnutls-1.4.1.orig/lib/gnutls_sig.c gnutls-1.4.1/lib/gnutls_sig.c
--- gnutls-1.4.1.orig/lib/gnutls_sig.c	2006-03-08 05:44:59.000000000 -0500
+++ gnutls-1.4.1/lib/gnutls_sig.c	2012-01-29 10:05:43.000000000 -0500
@@ -266,7 +266,7 @@ _gnutls_pkcs1_rsa_verify_sig (gnutls_cer
   int ret;
   gnutls_datum_t vdata;
 
-  if (cert->version == 0 || cert == NULL)
+  if (cert == NULL || cert->version == 0)
     {				/* this is the only way to check
 				 * if it is initialized
 				 */
diff -urp gnutls-1.4.1.orig/libextra/gnutls_openssl.c gnutls-1.4.1/libextra/gnutls_openssl.c
--- gnutls-1.4.1.orig/libextra/gnutls_openssl.c	2006-07-13 08:15:06.000000000 -0400
+++ gnutls-1.4.1/libextra/gnutls_openssl.c	2012-01-29 10:07:40.000000000 -0500
@@ -853,9 +853,9 @@ X509_get_issuer_name (const X509 * cert)
 char *
 X509_NAME_oneline (gnutls_x509_dn * name, char *buf, int len)
 {
-  memset (buf, 0, len);
   if (!buf)
     return NULL;
+  memset (buf, 0, len);
 
   snprintf (buf, len - 1,
 	    "C=%s, ST=%s, L=%s, O=%s, OU=%s, CN=%s/Email=%s",