Merge pull request #116 from twilfredo/wilfred/fixup-psk-compile

tlshd: fixup compile errors with HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2

Author: chucklever

src/tlshd/client.c

@@ -361,7 +361,8 @@ static void tlshd_tls13_client_psk_handshake_one(struct tlshd_handshake_parms *p
 	gnutls_psk_client_credentials_t psk_cred;
 	gnutls_session_t session;
 #ifdef HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2
-	int version, type, hash;
+	int version, hash;
+	char type;
 #endif
 	gnutls_datum_t key;
 	unsigned int flags;

src/tlshd/server.c

@@ -370,7 +370,7 @@ static void tlshd_tls13_server_psk_handshake(struct tlshd_handshake_parms *parms
 
 #ifdef HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2
 	ret = gnutls_psk_allocate_server_credentials2(&psk_cred,
-						      GNUTLS_MAC_NONE);
+						      GNUTLS_MAC_UNKNOWN);
 #else
 	ret = gnutls_psk_allocate_server_credentials(&psk_cred);
 #endif