You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
104 lines
2.1 KiB
104 lines
2.1 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../gnutls/CVE-2014-0092.patch |
|
# Copyright (C) 2014 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
--- a/lib/x509/verify.c |
|
+++ b/lib/x509/verify.c |
|
@@ -141,7 +141,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
- goto cleanup; |
|
+ goto fail; |
|
} |
|
|
|
result = |
|
@@ -150,7 +150,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
- goto cleanup; |
|
+ goto fail; |
|
} |
|
|
|
result = |
|
@@ -158,7 +158,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
- goto cleanup; |
|
+ goto fail; |
|
} |
|
|
|
result = |
|
@@ -166,7 +166,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
- goto cleanup; |
|
+ goto fail; |
|
} |
|
|
|
/* If the subject certificate is the same as the issuer |
|
@@ -206,6 +206,7 @@ |
|
else |
|
gnutls_assert (); |
|
|
|
+fail: |
|
result = 0; |
|
|
|
cleanup: |
|
@@ -330,7 +331,7 @@ |
|
gnutls_datum_t cert_signed_data = { NULL, 0 }; |
|
gnutls_datum_t cert_signature = { NULL, 0 }; |
|
gnutls_x509_crt_t issuer = NULL; |
|
- int issuer_version, result; |
|
+ int issuer_version, result = 0; |
|
|
|
if (output) |
|
*output = 0; |
|
@@ -363,7 +364,7 @@ |
|
if (issuer_version < 0) |
|
{ |
|
gnutls_assert (); |
|
- return issuer_version; |
|
+ return 0; |
|
} |
|
|
|
if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) && |
|
@@ -385,6 +386,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
+ result = 0; |
|
goto cleanup; |
|
} |
|
|
|
@@ -393,6 +395,7 @@ |
|
if (result < 0) |
|
{ |
|
gnutls_assert (); |
|
+ result = 0; |
|
goto cleanup; |
|
} |
|
|
|
@@ -410,6 +413,7 @@ |
|
else if (result < 0) |
|
{ |
|
gnutls_assert(); |
|
+ result = 0; |
|
goto cleanup; |
|
} |
|
|
|
|