Commit 4c8fb7fa authored by canterburym's avatar canterburym
Browse files

Fixing merge

parents 9e030eb2 ecfb079f
TS33128Payloads
<<<<<<< HEAD
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version1(1)}
=======
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version10(10)}
>>>>>>> cda907c0247cbcd3cbc0734c28beddb1d1497c94
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
......@@ -13,11 +9,7 @@ BEGIN
-- Relative OIDs
-- =============
<<<<<<< HEAD
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version1(1)}
=======
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version10(10)}
>>>>>>> cda907c0247cbcd3cbc0734c28beddb1d1497c94
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
......@@ -161,7 +153,18 @@ XIRIEvent ::= CHOICE
mMEDetach [88] MMEDetach,
mMELocationUpdate [89] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure,
-- AKMA key management events, see clause 7.X.1
aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister,
aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet,
aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial,
aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord,
aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh,
aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment,
aFApplicationKeyRemoval [1008] AFApplicationKeyRemoval
}
-- ==============
......@@ -308,7 +311,18 @@ IRIEvent ::= CHOICE
mMEDetach [88] MMEDetach,
mMELocationUpdate [89] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure,
-- AKMA key management Events, see clause 7.X.1
aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister,
aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet,
aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial,
aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord,
aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh,
aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment,
aFApplicationKeyRemoval [1008] AFApplicationKeyRemoval
}
IRITargetIdentifier ::= SEQUENCE
......@@ -823,6 +837,197 @@ EPSBearerID ::= INTEGER (0..255)
APN ::= UTF8String
-- =======================
-- AKMA AAnF definitions
-- =======================
AAnFAnchorKeyRegister ::= SEQUENCE
{
aKID [1] NAI,
sUPI [2] SUPI,
kAKMA [3] KAKMA OPTIONAL
}
AAnFKAKMAApplicationKeyGet ::= SEQUENCE
{
type [1] KeyGetType,
aKID [2] NAI,
keyInfo [3] AFKeyInfo
}
AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial ::= SEQUENCE
{
aKID [1] NAI,
kAKMA [2] KAKMA OPTIONAL,
aFKeyList [3] SEQUENCE OF AFKeyInfo OPTIONAL
}
AAnFAKMAContextRemovalRecord ::= SEQUENCE
{
aKID [1] NAI,
nFID [2] NFID
}
-- ======================
-- AKMA common parameters
-- ======================
FQDN ::= UTF8String
NFID ::= UTF8String
UAProtocolID ::= OCTET STRING (SIZE(5))
AKMAAFID ::= SEQUENCE
{
aFFQDN [1] FQDN,
uaProtocolID [2] UAProtocolID
}
UAStarParams ::= CHOICE
{
tls12 [1] TLS12UAStarParams,
generic [2] GenericUAStarParams
}
GenericUAStarParams ::= SEQUENCE
{
genericClientParams [1] OCTET STRING,
genericServerParams [2] OCTET STRING
}
-- ===========================================
-- Specific UaStarParmas for TLS 1.2 (RFC5246)
-- ===========================================
TLSCipherType ::= ENUMERATED
{
stream(1),
block(2),
aead(3)
}
TLSCompressionAlgorithm ::= ENUMERATED
{
null(1),
deflate(2)
}
TLSPRFAlgorithm ::= ENUMERATED
{
rfc5246(1)
}
TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255)
TLS12UAStarParams ::= SEQUENCE
{
preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL,
masterSecret [2] OCTET STRING (SIZE(6)),
pRFAlgorithm [3] TLSPRFAlgorithm,
cipherSuite [4] TLSCipherSuite,
cipherType [5] TLSCipherType,
encKeyLength [6] INTEGER (0..255),
blockLength [7] INTEGER (0..255),
fixedIVLength [8] INTEGER (0..255),
recordIVLength [9] INTEGER (0..255),
macLength [11] INTEGER (0..255),
macKeyLength [12] INTEGER (0..255),
compressionAlgorithm [13] TLSCompressionAlgorithm,
clientRandom [14] OCTET STRING (SIZE(4)),
serverRandom [15] OCTET STRING (SIZE(4)),
clientSequenceNumber [16] INTEGER,
serverSequenceNumber [17] INTEGER,
sessionID [18] OCTET STRING (SIZE(0..32)),
tLSExtensions [19] OCTET STRING (SIZE(0..65535))
}
KAF ::= OCTET STRING
KAKMA ::= OCTET STRING
-- ====================
-- AKMA AAnF parameters
-- ====================
KeyGetType ::= ENUMERATED
{
internal(1),
external(2)
}
AFKeyInfo ::= SEQUENCE
{
aFID [1] AKMAAFID,
kAF [2] KAF,
kAFExpTime [3] KAFExpiryTime
}
-- =======================
-- AKMA AF definitions
-- =======================
AFAKMAApplicationKeyRefresh ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
kAF [3] KAF,
uaStarParams [4] UAStarParams OPTIONAL
}
AFStartOfInterceptWithEstablishedAKMAApplicationKey ::= SEQUENCE
{
aFID [1] FQDN,
aKID [2] NAI,
kAFParamList [3] SEQUENCE OF AFSecurityParams
}
AFAuxiliarySecurityParameterEstablishment ::= SEQUENCE
{
aFSecurityParams [1] AFSecurityParams
}
AFSecurityParams ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
kAF [3] KAF,
uaStarParams [4] UAStarParams
}
AFApplicationKeyRemoval ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
removalCause [3] AFKeyRemovalCause
}
-- ===================
-- AKMA AF parameters
-- ===================
KAFParams ::= SEQUENCE
{
aKID [1] NAI,
kAF [2] KAF,
kAFExpTime [3] KAFExpiryTime,
uaStarParams [4] UAStarParams
}
KAFExpiryTime ::= GeneralizedTime
AFKeyRemovalCause ::= ENUMERATED
{
unknown(1),
keyExpiry(2),
applicationSpecific(3)
}
-- ==================
-- 5G AMF definitions
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
<<<<<<< HEAD
xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
=======
xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
>>>>>>> ecfb079f258c2141e556b6c98c545ab63e2a6e2a
<xs:element name="X1Extensions" type="X1Extension"></xs:element>
<xs:complexType name="X1Extensions">
<xs:sequence>
......@@ -236,4 +245,11 @@
</xs:simpleType>
<xs:element name="IdentityAssociationTargetIdentifier" type="EmptyElement"></xs:element>
<xs:element name="AKMATargetIdentifier" type="AKMATargetIdentifier"></xs:element>
<xs:complexType name="AKMATargetIdentifier">
<xs:choice>
<xs:element name="AKID" type="etsi103280:NAI"></xs:element>
</xs:choice>
</xs:complexType>
</xs:schema>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment