Commit 879bf659 authored by berge's avatar berge
Browse files

Removed cyclic import

parent f25b144f
Loading
Loading
Loading
Loading
+32 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ module ePassport_Types {
	import from LibCommon_DataStrings all;
	import from LibCommon_BasicTypesAndValues all;

	import from ePassport_Values all;


	group enumeratedTypes {

		type enumerated SecurityStatus {
@@ -579,6 +576,38 @@ module ePassport_Types {

			group DataObjects { // TLVs !!
			
            	group TlvConstants {
            		const TlvType c_crtCryptographicMechanismReference := '80'O;
            
            		// File and key references
            		const TlvType c_crtFileReference := '81'O;
            		const TlvType c_crtDfName := '82'O;
            		const TlvType c_crtReferenceOfSecretOrPublicKey := '83'O;
            		const TlvType c_crtReferenceOfSessionOrPrivateKey := '84'O;
            		const TlvType c_crtKeyUsageTemplate := 'A3'O;
            
            		// Initial data reference: Initial check block
            		const TlvType c_crtIcbNullBlock := '85'O;
            		const TlvType c_crtIcbChainingBlock := '86'O;
            		const TlvType c_crtIcbPreviousInitialValueBlockPlusOne := '87'O;
            		const TlvType c_crtIcbInitialValueBlock := '87'O;
            
            		// Initial data reference: auxiliary data elements
            		const TlvType c_crtAuxPreviousExchangedChallengePlusOne := '88'O;
            		const TlvType c_crtAuxNoFurtherIndication := '88'O;
            		const TlvType c_crtAuxHashCodeProvidedByCard := '90'O;
            		const TlvType c_crtAuxRandomNumberProvidedByCard := '91'O;
            		const TlvType c_crtAuxRandomNumber := '91'O;
            		const TlvType c_crtAuxTimestampProvidedByCard := '92'O;
            		const TlvType c_crtAuxTimestamp := '92'O;
            		const TlvType c_crtAuxPreviousDigitalSignatureCounterPlusOne := '93'O;
            		const TlvType c_crtAuxDigitalSignatureCounter := '93'O;
            		const TlvType c_crtAuxChallengeOrDataElementForDerivingKey := '94'O;
            		const TlvType c_rtUsageQualifierByte := '95'O;
            		const TlvType c_rtCryptogramContentReference := '8E'O;
            		
            	} // end TlvConstants			

				type Oct1 TlvType;
				type integer TlvLength; 

+0 −32
Original line number Diff line number Diff line
@@ -66,38 +66,6 @@ module ePassport_Values {
		
	}
	
	group TlvConstants {
		const TlvType c_crtCryptographicMechanismReference := '80'O;

		// File and key references
		const TlvType c_crtFileReference := '81'O;
		const TlvType c_crtDfName := '82'O;
		const TlvType c_crtReferenceOfSecretOrPublicKey := '83'O;
		const TlvType c_crtReferenceOfSessionOrPrivateKey := '84'O;
		const TlvType c_crtKeyUsageTemplate := 'A3'O;

		// Initial data reference: Initial check block
		const TlvType c_crtIcbNullBlock := '85'O;
		const TlvType c_crtIcbChainingBlock := '86'O;
		const TlvType c_crtIcbPreviousInitialValueBlockPlusOne := '87'O;
		const TlvType c_crtIcbInitialValueBlock := '87'O;

		// Initial data reference: auxiliary data elements
		const TlvType c_crtAuxPreviousExchangedChallengePlusOne := '88'O;
		const TlvType c_crtAuxNoFurtherIndication := '88'O;
		const TlvType c_crtAuxHashCodeProvidedByCard := '90'O;
		const TlvType c_crtAuxRandomNumberProvidedByCard := '91'O;
		const TlvType c_crtAuxRandomNumber := '91'O;
		const TlvType c_crtAuxTimestampProvidedByCard := '92'O;
		const TlvType c_crtAuxTimestamp := '92'O;
		const TlvType c_crtAuxPreviousDigitalSignatureCounterPlusOne := '93'O;
		const TlvType c_crtAuxDigitalSignatureCounter := '93'O;
		const TlvType c_crtAuxChallengeOrDataElementForDerivingKey := '94'O;
		const TlvType c_rtUsageQualifierByte := '95'O;
		const TlvType c_rtCryptogramContentReference := '8E'O;
		
	} // end TlvConstants
	
	group automaticInterfaceSpecification {
		
		group failureCodes {