summaryrefslogtreecommitdiff
path: root/lib/auth
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-09-30 10:21:53 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-09-30 10:22:33 +0200
commitbcd53f59d2630243aac2fe4ea6ae6742856903f8 (patch)
tree61f7c56bfcc4a1a8aacf6e6ac10b895063c5a931 /lib/auth
parent33e6e795e4d53f13b53b5e4a310a7c1404177207 (diff)
downloadgnutls-bcd53f59d2630243aac2fe4ea6ae6742856903f8.tar.gz
removed unused functions.
Diffstat (limited to 'lib/auth')
-rw-r--r--lib/auth/psk.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/auth/psk.c b/lib/auth/psk.c
index 34d95decce..858f2f9978 100644
--- a/lib/auth/psk.c
+++ b/lib/auth/psk.c
@@ -68,6 +68,7 @@ _gnutls_set_psk_session_key (gnutls_session_t session,
{
gnutls_datum_t pwd_psk = { NULL, 0 };
size_t dh_secret_size;
+ uint8_t * p;
int ret;
if (dh_secret == NULL)
@@ -92,12 +93,18 @@ _gnutls_set_psk_session_key (gnutls_session_t session,
* (uint16_t) psk_size
* the psk
*/
- _gnutls_write_uint16 (dh_secret_size, session->key->key.data);
+ p = session->key->key.data;
+ _gnutls_write_uint16 (dh_secret_size, p);
+ p+=2;
if (dh_secret == NULL)
- memset (&session->key->key.data[2], 0, dh_secret_size);
+ memset (p, 0, dh_secret_size);
else
- memcpy (&session->key->key.data[2], dh_secret->data, dh_secret->size);
- _gnutls_write_datum16 (&session->key->key.data[dh_secret_size + 2], *ppsk);
+ memcpy (p, dh_secret->data, dh_secret->size);
+
+ p += dh_secret_size;
+ _gnutls_write_uint16 (ppsk->size, p);
+ if (ppsk->data != NULL)
+ memcpy (p+2, ppsk->data, ppsk->size);
ret = 0;