Commit dd986215 authored by fetke's avatar fetke
Browse files

formatting;

made CvCertificateBodyValue a PDU to enable encoding
parent 3fcdcf9d
Loading
Loading
Loading
Loading
+65 −40
Original line number Original line Diff line number Diff line
@@ -1016,51 +1016,74 @@ module ePassport_Types {
					const TlvType c_smCertificate				:= '92'O;
					const TlvType c_smCertificate				:= '92'O;
					const TlvType c_smCertificateIncludedInAuth	:= '93'O;
					const TlvType c_smCertificateIncludedInAuth	:= '93'O;


					const TlvType c_smInputForComputationOfDigitalSignature := '9A'O;
					const TlvType c_smInputForComputationOfDigitalSignature
					const TlvType c_smInputForComputationOfDigitalSignatureIncludedInAuth := '9B'O;
																:= '9A'O;
					const TlvType
						c_smInputForComputationOfDigitalSignatureIncludedInAuth
																:= '9B'O;
					const TlvType c_smPublicKey					:= '9C'O;
					const TlvType c_smPublicKey					:= '9C'O;
					const TlvType c_smPublicKeyIncludedInAuth	:= '9D'O;
					const TlvType c_smPublicKeyIncludedInAuth	:= '9D'O;
					const TlvType c_smDigitalSignature			:= '9E'O;
					const TlvType c_smDigitalSignature			:= '9E'O;


					// PSO constants
					// PSO constants
					const TlvType c_psoComputateHashCode		:= 'A0'O;
					const TlvType c_psoComputateHashCode		:= 'A0'O;
					const TlvType c_psoComputateHashCodeIncludedInAuth := 'A1'O;
					const TlvType c_psoComputateHashCodeIncludedInAuth

																:= 'A1'O;
					const TlvType c_smInputTemplateVerifyCertificateOverValueFields := 'AE'O;

					const TlvType c_smInputTemplateVerifyCertificateOverValueFieldsIncludedInAuth := 'AF'O;
					const TlvType
					const TlvType c_smInputTemplateVerifyCertificateOverFullTemplate := 'BE'O;
						c_smInputTemplateVerifyCertificateOverValueFields
																:= 'AE'O;
					const TlvType
						c_smInputTemplateVerifyCertificateOverValueFieldsIncludedInAuth
																:= 'AF'O;
					const TlvType
						c_smInputTemplateVerifyCertificateOverFullTemplate
																:= 'BE'O;


				} // end SecureMessagingConstants
				} // end SecureMessagingConstants


				group ControlReferenceConstants {
				group ControlReferenceConstants {
					const TlvType c_crtCryptographicMechanismReference := '80'O;
					const TlvType c_crtCryptographicMechanismReference
																:= '80'O;


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


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


					// Initial data reference: auxiliary data elements
					// Initial data reference: auxiliary data elements
					const TlvType c_crtAuxPreviousExchangedChallengePlusOne := '88'O;
					const TlvType c_crtAuxPreviousExchangedChallengePlusOne
																:= '88'O;
					const TlvType c_crtAuxNoFurtherIndication	:= '88'O;
					const TlvType c_crtAuxNoFurtherIndication	:= '88'O;
					const TlvType c_crtAuxHashCodeProvidedByCard := '90'O;
					const TlvType c_crtAuxHashCodeProvidedByCard
					const TlvType c_crtAuxRandomNumberProvidedByCard := '91'O;
																:= '90'O;
					const TlvType c_crtAuxRandomNumberProvidedByCard
																:= '91'O;
					const TlvType c_crtAuxRandomNumber			:= '91'O;
					const TlvType c_crtAuxRandomNumber			:= '91'O;
					const TlvType c_crtAuxTimestampProvidedByCard := '92'O;
					const TlvType c_crtAuxTimestampProvidedByCard
					const TlvType c_crtAuxTimestamp := '92'O;
																:= '92'O;
					const TlvType c_crtAuxPreviousDigitalSignatureCounterPlusOne := '93'O;
					const TlvType c_crtAuxTimestamp
					const TlvType c_crtAuxDigitalSignatureCounter := '93'O;
																:= '92'O;
					const TlvType c_crtAuxChallengeOrDataElementForDerivingKey := '94'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_rtUsageQualifierByte		:= '95'O;
					const TlvType c_rtCryptogramContentReference := '8E'O;
					const TlvType c_rtCryptogramContentReference
																:= '8E'O;


				} // end ControlReferenceConstants
				} // end ControlReferenceConstants


@@ -1116,6 +1139,8 @@ module ePassport_Types {
						CvCertificateHolderAuthorizationTemplate cvCertificateHolderAuthorizationTemplate,
						CvCertificateHolderAuthorizationTemplate cvCertificateHolderAuthorizationTemplate,
						CvCertificateEffectiveDate cvCertificateEffectiveDate,
						CvCertificateEffectiveDate cvCertificateEffectiveDate,
						CvCertificateExpirationDate cvCertificateExpirationDate
						CvCertificateExpirationDate cvCertificateExpirationDate
					} with {
					    variant "isPDU";
					}
					}


					type record CvCertificateProfileIdentifier {
					type record CvCertificateProfileIdentifier {