From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 11 Aug 2006 22:40:36 +0000 (+0000)
Subject: (_gnutls_x509_oid2mac_algorithm): Don't crash trying to strcmp the
X-Git-Tag: gnutls_1_4_2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34d87a7c3f12794a3ec2305cd2fdbae152bf2a76;p=thirdparty%2Fgnutls.git

(_gnutls_x509_oid2mac_algorithm): Don't crash trying to strcmp the
NULL OID value in the hash_algorithms array, which happens when the
input OID doesn't match our OIDs for SHA1, MD5, MD2 or RIPEMD160.
Reported by satyakumar <satyam_kkd@hyd.hellosoft.com>.
---

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 9dbff2e509..9be8de7ddf 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -563,7 +563,7 @@ _gnutls_x509_oid2mac_algorithm (const char *oid)
 {
   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;}
   );