From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 15 Dec 2015 12:52:20 +0000 (+0100)
Subject: make sure gnutls_assert is present at the cases where GNUTLS_E_INTERNAL_ERROR is... 
X-Git-Tag: gnutls_3_5_0~482
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8fa2938eb4bc87807cc4ecb9b1a45ac06001dde;p=thirdparty%2Fgnutls.git

make sure gnutls_assert is present at the cases where GNUTLS_E_INTERNAL_ERROR is returned
---

diff --git a/lib/session_pack.c b/lib/session_pack.c
index 19229b70d9..e49b32c54f 100644
--- a/lib/session_pack.c
+++ b/lib/session_pack.c
@@ -136,7 +136,7 @@ _gnutls_session_pack(gnutls_session_t session,
 		}
 		break;
 	default:
-		return GNUTLS_E_INTERNAL_ERROR;
+		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 	}
 
diff --git a/lib/state.c b/lib/state.c
index 3758ad8d17..93c17dcebe 100644
--- a/lib/state.c
+++ b/lib/state.c
@@ -521,7 +521,7 @@ int _gnutls_dh_set_peer_public(gnutls_session_t session, bigint_t public)
 			anon_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -531,7 +531,7 @@ int _gnutls_dh_set_peer_public(gnutls_session_t session, bigint_t public)
 			psk_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -542,14 +542,13 @@ int _gnutls_dh_set_peer_public(gnutls_session_t session, bigint_t public)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
 		}
 	default:
-		gnutls_assert();
-		return GNUTLS_E_INTERNAL_ERROR;
+		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 	}
 
 	if (dh->public_key.data)
@@ -572,7 +571,7 @@ int _gnutls_dh_set_secret_bits(gnutls_session_t session, unsigned bits)
 			anon_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			info->dh.secret_bits = bits;
 			break;
 		}
@@ -581,7 +580,7 @@ int _gnutls_dh_set_secret_bits(gnutls_session_t session, unsigned bits)
 			psk_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			info->dh.secret_bits = bits;
 			break;
 		}
@@ -591,13 +590,12 @@ int _gnutls_dh_set_secret_bits(gnutls_session_t session, unsigned bits)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			info->dh.secret_bits = bits;
 			break;
 	default:
-			gnutls_assert();
-			return GNUTLS_E_INTERNAL_ERROR;
+			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 		}
 	}
 
@@ -619,7 +617,7 @@ _gnutls_dh_set_group(gnutls_session_t session, bigint_t gen,
 			anon_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -629,7 +627,7 @@ _gnutls_dh_set_group(gnutls_session_t session, bigint_t gen,
 			psk_auth_info_t info;
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -640,14 +638,13 @@ _gnutls_dh_set_group(gnutls_session_t session, bigint_t gen,
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
 		}
 	default:
-		gnutls_assert();
-		return GNUTLS_E_INTERNAL_ERROR;
+		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 	}
 
 	if (dh->prime.data)
diff --git a/lib/ui.c b/lib/ui.c
index a5f4c30938..e84feec970 100644
--- a/lib/ui.c
+++ b/lib/ui.c
@@ -144,19 +144,19 @@ gnutls_dh_get_group(gnutls_session_t session,
 	case GNUTLS_CRD_ANON:
 		anon_info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 		if (anon_info == NULL)
-			return GNUTLS_E_INTERNAL_ERROR;
+			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 		dh = &anon_info->dh;
 		break;
 	case GNUTLS_CRD_PSK:
 		psk_info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 		if (psk_info == NULL)
-			return GNUTLS_E_INTERNAL_ERROR;
+			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 		dh = &psk_info->dh;
 		break;
 	case GNUTLS_CRD_CERTIFICATE:
 		cert_info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 		if (cert_info == NULL)
-			return GNUTLS_E_INTERNAL_ERROR;
+			return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 		dh = &cert_info->dh;
 		break;
 	default:
@@ -211,7 +211,7 @@ gnutls_dh_get_pubkey(gnutls_session_t session, gnutls_datum_t * raw_key)
 		{
 			anon_info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (anon_info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			dh = &anon_info->dh;
 			break;
 		}
@@ -219,7 +219,7 @@ gnutls_dh_get_pubkey(gnutls_session_t session, gnutls_datum_t * raw_key)
 		{
 			psk_info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (psk_info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			dh = &psk_info->dh;
 			break;
 		}
@@ -228,7 +228,7 @@ gnutls_dh_get_pubkey(gnutls_session_t session, gnutls_datum_t * raw_key)
 
 			cert_info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (cert_info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			dh = &cert_info->dh;
 			break;
 		}
@@ -261,7 +261,7 @@ int gnutls_dh_get_secret_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			return info->dh.secret_bits;
 		}
 	case GNUTLS_CRD_PSK:
@@ -270,7 +270,7 @@ int gnutls_dh_get_secret_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			return info->dh.secret_bits;
 		}
 	case GNUTLS_CRD_CERTIFICATE:
@@ -279,7 +279,7 @@ int gnutls_dh_get_secret_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			return info->dh.secret_bits;
 		}
@@ -332,7 +332,7 @@ int gnutls_dh_get_prime_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			dh = &info->dh;
 			break;
 		}
@@ -342,7 +342,7 @@ int gnutls_dh_get_prime_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 			dh = &info->dh;
 			break;
 		}
@@ -352,7 +352,7 @@ int gnutls_dh_get_prime_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -390,7 +390,7 @@ int gnutls_dh_get_peers_public_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_ANON);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -401,7 +401,7 @@ int gnutls_dh_get_peers_public_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;
@@ -412,7 +412,7 @@ int gnutls_dh_get_peers_public_bits(gnutls_session_t session)
 
 			info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE);
 			if (info == NULL)
-				return GNUTLS_E_INTERNAL_ERROR;
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 			dh = &info->dh;
 			break;