From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 2 Feb 2009 14:13:19 +0000 (+0100)
Subject: Assert less for expected errors.
X-Git-Tag: gnutls_2_7_5~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfd77da5da75ef5da13e2036d6a37d117befb299;p=thirdparty%2Fgnutls.git

Assert less for expected errors.
---

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 76712740fe..e6c16bf1d8 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson, Howard Chu
  *
  * This file is part of GNUTLS.
@@ -751,7 +751,8 @@ gnutls_x509_crt_get_subject_key_id (gnutls_x509_crt_t cert, void *ret,
 
   if (result != ASN1_SUCCESS)
     {
-      gnutls_assert ();
+      if (result != ASN1_MEM_ERROR)
+	gnutls_assert ();
       return _gnutls_asn2err (result);
     }
 
@@ -840,7 +841,8 @@ gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert, void *ret,
 
   if (result != ASN1_SUCCESS)
     {
-      gnutls_assert ();
+      if (result != ASN1_MEM_ERROR)
+	gnutls_assert ();
       return _gnutls_asn2err (result);
     }