summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2006-08-11 22:47:06 +0000
committerSimon Josefsson <simon@josefsson.org>2006-08-11 22:47:06 +0000
commitc55225b50f8aa4321e7f4a168875235070baa63f (patch)
tree8ac1236ace10c9a6df19204ec08bf22258b5cf2a
parent3b9e773e91432df9bc1ca3894f9b7386a7fedb58 (diff)
downloadgnutls-c55225b50f8aa4321e7f4a168875235070baa63f.tar.gz
(_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>.
-rw-r--r--lib/gnutls_algorithms.c4
1 files changed, 2 insertions, 2 deletions
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;}
);