Changeset 610:a137913d9f88 in freeDiameter for extensions/app_diameap/diameap_eap.c

Timestamp:

Dec 1, 2010, 6:19:54 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added ability to extract the Extended MSK (EMSK) for future use

File:

• extensions/app_diameap/diameap_eap.c (modified) (2 diffs)

extensions/app_diameap/diameap_eap.c

@@ -444 +444 @@
                         {
                                 /*diameap_ba_PolicyUpdate();*/
-                                eap_i->aaaEapKeyLength = 0;
+                                eap_i->aaaEapMSKLength = 0;
+                                eap_i->aaaEapEMSKLength = 0;
                                 if (eap_sm->selectedMethod->eap_method_getKey)
                                 {
                                         if ((*eap_sm->selectedMethod->eap_method_getKey)(eap_sm,
-                                                        &eap_i->aaaEapKeyData, &eap_i->aaaEapKeyLength))
+                                                        &eap_i->aaaEapMSKData, &eap_i->aaaEapMSKLength,
+                                                        &eap_i->aaaEapEMSKData, &eap_i->aaaEapEMSKLength))
                                         {
                                                 TRACE_DEBUG(INFO,"%s[EAP Protocol] Generating EAP Master Key failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname)
-                                                eap_i->aaaEapKeyLength = 0;
+                                                eap_i->aaaEapMSKLength = 0;
+                                                eap_i->aaaEapEMSKLength = 0;
                                                 eap_i->aaaEapKeyAvailable = FALSE;
                                         }
@@ -556 +559 @@
                                 CHECK_FCT(diameap_eap_new(EAP_SUCCESS, (u8) eap_sm->currentId, TYPE_NONE, NULL, 0,&eap_i->aaaEapReqData))
                                 ;
-                                if (eap_i->aaaEapKeyData != NULL)
+                                if (eap_i->aaaEapMSKData != NULL)
                                 {
                                         TRACE_DEBUG(FULL+1,"%s[EAP Protocol] EAP Key available [User: %s].",DIAMEAP_EXTENSION,eap_sm->user.userid);