tls: update psk xlat call

Ilclude talloc context in xlat and setup of psk-user-identity in request.

diff --git a/src/main/tls.c b/src/main/tls.c
index 93d4c6d..2937574 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -99,15 +99,15 @@ static unsigned int psk_server_callback(SSL *ssl, const char *identity,
                 size_t hex_len = 0;
                if (max_psk_len > PSK_MAX_PSK_LEN)
                  max_psk_len = PSK_MAX_PSK_LEN;
-               vp = radius_pairmake(request, &request->config_items,
+               vp = pairmake(request, &request->config_items,
                                  "tls-psk-identity",
                                  identity, T_OP_SET);
                if (vp) {
                        if (identity_is_safe(identity))
                          hex_len = radius_xlat((char *) psk_buffer,
                                                2*max_psk_len+1,
-                                               "%{psksql:select hex(key) from psk_keys where keyid = '%{control:tls-psk-identity}';}",
-                                               request, NULL, NULL);
+                                               request, "%{psksql:select hex(key) from psk_keys where keyid = '%{control:tls-psk-identity}';}",
+                                               NULL, NULL);
                        if (hex_len >0)
                          return fr_hex2bin(psk_buffer, psk, hex_len);
                }