From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 21 Aug 2015 11:54:41 +0000 (+0200)
Subject: PSK: save the username in client side in the auth structure
X-Git-Tag: gnutls_3_5_0~728
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48b5499003d72d006e16fa7f29401cb3a608e576;p=thirdparty%2Fgnutls.git

PSK: save the username in client side in the auth structure
---

diff --git a/lib/auth/psk.c b/lib/auth/psk.c
index 8b223923a6..7244ed5585 100644
--- a/lib/auth/psk.c
+++ b/lib/auth/psk.c
@@ -164,6 +164,7 @@ _gnutls_gen_psk_client_kx(gnutls_session_t session,
 	gnutls_datum_t username = {NULL, 0};
 	gnutls_datum_t key;
 	gnutls_psk_client_credentials_t cred;
+	psk_auth_info_t info;
 
 	cred = (gnutls_psk_client_credentials_t)
 	    _gnutls_get_cred(session, GNUTLS_CRD_PSK);
@@ -173,6 +174,12 @@ _gnutls_gen_psk_client_kx(gnutls_session_t session,
 		return GNUTLS_E_INSUFFICIENT_CREDENTIALS;
 	}
 
+	info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK);
+	if (info == NULL) {
+		gnutls_assert();
+		return GNUTLS_E_INTERNAL_ERROR;
+	}
+
 	ret = _gnutls_find_psk_key(session, cred, &username, &key, &free);
 	if (ret < 0)
 		return gnutls_assert_val(ret);
@@ -190,6 +197,16 @@ _gnutls_gen_psk_client_kx(gnutls_session_t session,
 		gnutls_assert();
 	}
 
+	if (username.size > sizeof(info->username)-1) {
+		gnutls_assert();
+		ret = GNUTLS_E_ILLEGAL_SRP_USERNAME;
+		goto cleanup;
+	}
+
+	memcpy(info->username, username.data, username.size);
+	info->username[username.size] = 0;
+
+
       cleanup:
 	if (free) {
 		gnutls_free(username.data);
@@ -353,7 +370,7 @@ _gnutls_proc_psk_server_kx(gnutls_session_t session, uint8_t * data,
 		return GNUTLS_E_INTERNAL_ERROR;
 	}
 
-	if (hint.size > MAX_USERNAME_SIZE) {
+	if (hint.size > sizeof(info->hint)-1) {
 		gnutls_assert();
 		return GNUTLS_E_ILLEGAL_SRP_USERNAME;
 	}