Fix arguments to gen keys

Now that we have packet, we don't have to pass a VPS pointer

diff --git a/src/modules/rlm_eap/libeap/eap_tls.c b/src/modules/rlm_eap/libeap/eap_tls.c
index 8d8902c..6fd7433 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_tls.c
+++ b/src/modules/rlm_eap/libeap/eap_tls.c
@@ -166,7 +166,7 @@ int eaptls_success(eap_handler_t *handler, int peap_flag)
        }
 
        eaptls_gen_eap_key(handler->request->reply, tls_session->ssl,
-                          handler->type, &handler->request->reply->vps);
+                          handler->type);
        return 1;
 }
 

diff --git a/src/modules/rlm_eap/libeap/eap_tls.h b/src/modules/rlm_eap/libeap/eap_tls.h
index 2a91f34..035dc15 100644 (file)
--- a/src/modules/rlm_eap/libeap/eap_tls.h
+++ b/src/modules/rlm_eap/libeap/eap_tls.h
@@ -70,7 +70,7 @@ int           eaptls_request(EAP_DS *eap_ds, tls_session_t *ssn);
 void       eaptls_gen_mppe_keys(REQUEST *request, SSL *s,
                                 const char *prf_label);
 void           eapttls_gen_challenge(SSL *s, uint8_t *buffer, size_t size);
-void eaptls_gen_eap_key(RADIUS_PACKET *packet, SSL *s, uint32_t header, VALUE_PAIR **vps);
+void eaptls_gen_eap_key(RADIUS_PACKET *packet, SSL *s, uint32_t header);
 
 #define BUFFER_SIZE 1024
 

diff --git a/src/modules/rlm_eap/libeap/mppe_keys.c b/src/modules/rlm_eap/libeap/mppe_keys.c
index 34ae0db..0483254 100644 (file)
--- a/src/modules/rlm_eap/libeap/mppe_keys.c
+++ b/src/modules/rlm_eap/libeap/mppe_keys.c
@@ -177,7 +177,7 @@ void eapttls_gen_challenge(SSL *s, uint8_t *buffer, size_t size)
  *     Actually generates EAP-Session-Id, which is an internal server
  *     attribute.  Not all systems want to send EAP-Key-Nam
  */
-void eaptls_gen_eap_key(RADIUS_PACKET *packet, SSL *s, uint32_t header, VALUE_PAIR **vps)
+void eaptls_gen_eap_key(RADIUS_PACKET *packet, SSL *s, uint32_t header)
 {
        VALUE_PAIR *vp;
 
@@ -194,5 +194,5 @@ void eaptls_gen_eap_key(RADIUS_PACKET *packet, SSL *s, uint32_t header, VALUE_PA
        memcpy(vp->vp_octets + 1 + SSL3_RANDOM_SIZE,
               s->s3->server_random, SSL3_RANDOM_SIZE);
        vp->length = 1 + 2 * SSL3_RANDOM_SIZE;
-       pairadd(vps, vp);
+       pairadd(&packet->vps, vp);
 }