Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerititan2018-06-19 04:06:07 -0400
committererititan2018-06-19 04:06:07 -0400
commit64336af39573453aaa18f88773b1d7fde55be2a5 (patch)
treed994b0321d3ac859e1b942c88d22f347d31e1b35
parent97c194866c4786b8587c8aadb3367d61a1f0e968 (diff)
downloadtitan.ProtocolModules.EAP-64336af39573453aaa18f88773b1d7fde55be2a5.tar.gz
titan.ProtocolModules.EAP-64336af39573453aaa18f88773b1d7fde55be2a5.tar.xz
titan.ProtocolModules.EAP-64336af39573453aaa18f88773b1d7fde55be2a5.zip
R5A -> R6A
-rw-r--r--EAP_CNL113722.tpd15
-rw-r--r--doc/EAP_CNL113722_6_PRI.docbin0 -> 78848 bytes
-rw-r--r--doc/EAP_CNL133722_1551_1.docbin105984 -> 109056 bytes
-rw-r--r--src/EAP.grp2
-rw-r--r--src/EAP_EncDec.cc18
-rw-r--r--src/EAP_Types.ttcn5
6 files changed, 33 insertions, 7 deletions
diff --git a/EAP_CNL113722.tpd b/EAP_CNL113722.tpd
index c870c8b..337f82e 100644
--- a/EAP_CNL113722.tpd
+++ b/EAP_CNL113722.tpd
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2017 Ericsson
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+
+ File: EAP_CNL113722.tpd
+ Description: tpd project file
+ Rev: R6A
+ Prodnr: CNL 113 722
+
+ -->
<TITAN_Project_File_Information version="1.0">
<ProjectName>EAP_CNL113722</ProjectName>
<Folders>
diff --git a/doc/EAP_CNL113722_6_PRI.doc b/doc/EAP_CNL113722_6_PRI.doc
new file mode 100644
index 0000000..abf7ac5
--- /dev/null
+++ b/doc/EAP_CNL113722_6_PRI.doc
Binary files differ
diff --git a/doc/EAP_CNL133722_1551_1.doc b/doc/EAP_CNL133722_1551_1.doc
index 87fa95c..11a78dc 100644
--- a/doc/EAP_CNL133722_1551_1.doc
+++ b/doc/EAP_CNL133722_1551_1.doc
Binary files differ
diff --git a/src/EAP.grp b/src/EAP.grp
index 044929d..ac40e73 100644
--- a/src/EAP.grp
+++ b/src/EAP.grp
@@ -11,7 +11,7 @@
//
// File: EPTF_Radius.grp
// Description: FileGroup file for EAP
-// Rev: R4E
+// Rev: R6A
// Prodnr: CNL 113 722
// Updated: 2012-06-13
// Contact: http://ttcn.ericsson.se
diff --git a/src/EAP_EncDec.cc b/src/EAP_EncDec.cc
index 178416b..a609549 100644
--- a/src/EAP_EncDec.cc
+++ b/src/EAP_EncDec.cc
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
//
// File: EAP_EncDec.cc
-// Rev: R4E
+// Rev: R6A
// Prodnr: CNL 113 722
// Updated: 2014-01-24
// Contact: http://ttcn.ericsson.se
@@ -20,9 +20,6 @@
// RFC 5281(EAP-TTLS)
///////////////////////////////////////////////////////////////////////////////
-
-
-
#include "EAP_Types.hh"
#include <stdint.h>
#include <openssl/sha.h>
@@ -332,6 +329,19 @@ OCTETSTRING eap__aka__derive__mk(const OCTETSTRING& p_identity, const OCTETSTRIN
OCTETSTRING mk_value(20,mk);
return mk_value;
+}
+
+OCTETSTRING eap__aka__derive__reauth__msk__emsk(const OCTETSTRING& p_identity, const OCTETSTRING& p_counter, const OCTETSTRING& p_nonce_s, const OCTETSTRING& p_mk)
+{
+ unsigned char reauth_msk_emsk[20];
+ OCTETSTRING source_os = p_identity + p_counter + p_nonce_s + p_mk;
+ const unsigned char *source = (const unsigned char*)source_os;
+
+ /* MK = SHA1(Identity|counter|NONCE_S|MK) */
+ SHA1(source, source_os.lengthof(), reauth_msk_emsk);
+
+ OCTETSTRING emsk_value(20,reauth_msk_emsk);
+ return emsk_value;
}
//Added for EPC
diff --git a/src/EAP_Types.ttcn b/src/EAP_Types.ttcn
index c6ecc45..702da08 100644
--- a/src/EAP_Types.ttcn
+++ b/src/EAP_Types.ttcn
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////////
//
// File: EAP_Types.ttcn
-// Rev: R4E
+// Rev: R6A
// Prodnr: CNL 113 722
// Updated: 2014-01-24
// Contact: http://ttcn.ericsson.se
@@ -36,7 +36,8 @@ module EAP_Types
external function eap_sim_derive_mk(octetstring identity,octetstring nonce_mt,integer selected_version,octetstring ver_list,octetstring kc) return octetstring;
external function fips186_2_prf(octetstring input) return octetstring;
- external function eap_aka_derive_mk(octetstring identity,octetstring ik,octetstring ck) return octetstring;
+ external function eap_aka_derive_mk(octetstring identity,octetstring ik,octetstring ck) return octetstring;
+ external function eap_aka_derive_reauth_msk_emsk(octetstring identity,octetstring counter,octetstring nonce_s,octetstring mk) return octetstring;
//external function eap_aka_prime_derive_keys(octetstring identity,integer len,octetstring ik,octetstring ck,octetstring k_encr,octetstring k_aut, octetstring k_re, octetstring msk, octetstring emsk);
external function eap_akaprime_derive_mk(octetstring identity,octetstring ik,octetstring ck) return octetstring;

Back to the top