Commit 94532c09 authored by fetke's avatar fetke
Browse files

formatting

parent cb438880
Loading
Loading
Loading
Loading
+83 −37
Original line number Diff line number Diff line
@@ -752,27 +752,60 @@ module ePassport_Types {
				    PsoEncipher						psoEncipher,
				    PsoDecipher						psoDecipher
				} with {
					variant (psoComputeCryptographicChecksum)	"fieldPresent=getIntTag('psoResponseTag')==0x8e";
					variant (psoComputeDigitalSignature)	"fieldPresent=getIntTag('psoResponseTag')==0x9e";
					variant (psoHash)	"fieldPresent=getIntTag('psoResponseTag')==0x90";
					variant (psoVerifyCryptographicChecksum)	"fieldPresent=getIntTag('psoResponseTag')==0x00&&getIntTag('psoCommandTag')==0xa2";
					variant (psoVerifyDigitalSignature)	"fieldPresent=getIntTag('psoResponseTag')==0x00&&getIntTag('psoCommandTag')==0xa8";
					variant (psoVerifyCertificate)	"fieldPresent=getIntTag('psoResponseTag')==0x00&&(getIntTag('psoCommandTag')==0x92||getIntTag('psoCommandTag')==0xae||getIntTag('psoCommandTag')==0xbe)";
					variant (psoEncipher)	"fieldPresent=(getIntTag('psoResponseTag')==0x82||getIntTag('psoResponseTag')==0x84||getIntTag('psoResponseTag')==0x86)&&getIntTag('psoCommandTag')==0x80";
					variant (psoDecipher)	"fieldPresent=getIntTag('psoResponseTag')==0x80&&(getIntTag('psoCommandTag')==0x82||getIntTag('psoCommandTag')==0x84||getIntTag('psoCommandTag')==0x86)";	
					variant (psoComputeCryptographicChecksum)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x8e";
					variant (psoComputeDigitalSignature)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x9e";
					variant (psoHash)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x90";
					variant (psoVerifyCryptographicChecksum)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x00&&"
							"getIntTag('psoCommandTag')==0xa2";
					variant (psoVerifyDigitalSignature)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x00&&"
							"getIntTag('psoCommandTag')==0xa8";
					variant (psoVerifyCertificate)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x00&&"
								"(getIntTag('psoCommandTag')==0x92||"
								 "getIntTag('psoCommandTag')==0xae||"
								 "getIntTag('psoCommandTag')==0xbe)";
					variant (psoEncipher)
						"fieldPresent="
							"(getIntTag('psoResponseTag')==0x82||"
							 "getIntTag('psoResponseTag')==0x84||"
							 "getIntTag('psoResponseTag')==0x86)&&"
							"getIntTag('psoCommandTag')==0x80";
					variant (psoDecipher)
						"fieldPresent="
							"getIntTag('psoResponseTag')==0x80&&"
							"(getIntTag('psoCommandTag')==0x82||"
							 "getIntTag('psoCommandTag')==0x84||"
							 "getIntTag('psoCommandTag')==0x86)";	
				}
				
				type octetstring PsoComputeCryptographicChecksum;
				 
				type union PsoComputeDigitalSignature {
					PsoComputeDigitalSignatureOverFullTemplate psoComputeDigitalSignatureOverFullTemplate,
					PsoComputeDigitalSignatureOverValueFields psoComputeDigitalSignatureOverValueFields,
					PsoComputeDigitalSignatureOverData psoComputeDigitalSignatureOverData     
					PsoComputeDigitalSignatureOverFullTemplate
						psoComputeDigitalSignatureOverFullTemplate,
					PsoComputeDigitalSignatureOverValueFields
						psoComputeDigitalSignatureOverValueFields,
					PsoComputeDigitalSignatureOverData
						psoComputeDigitalSignatureOverData
				}
				with {
				    variant (psoComputeDigitalSignatureOverFullTemplate) "fieldPresent=getIntTag('psoCommandTag')==0xbc";
				    variant (psoComputeDigitalSignatureOverValueFields) "fieldPresent=getIntTag('psoCommandTag')==0xac";
				    variant (psoComputeDigitalSignatureOverData) "fieldPresent=getIntTag('psoCommandTag')==0x9a";
				    variant (psoComputeDigitalSignatureOverFullTemplate)
				    	"fieldPresent=getIntTag('psoCommandTag')==0xbc";
				    variant (psoComputeDigitalSignatureOverValueFields)
				    	"fieldPresent=getIntTag('psoCommandTag')==0xac";
				    variant (psoComputeDigitalSignatureOverData)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x9a";
				}

				type union PsoHash {
@@ -780,32 +813,45 @@ module ePassport_Types {
				    PsoComputeHashCode psoComputeHashCode
				}
				with {
				    variant (psoHash) "fieldPresent=getIntTag('psoCommandTag')==0x80";
				    variant (psoComputeHashCode) "fieldPresent=getIntTag('psoCommandTag')==0xa0";
				    variant (psoHash)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x80";
				    variant (psoComputeHashCode)
				    	"fieldPresent=getIntTag('psoCommandTag')==0xa0";
				}
				 
				type union PsoVerifyCertificate {
				    PsoCertificate psoCertificate,
				    PsoVerifyCertificateOverValueFields psoVerifyCertificateOverValueFields,
				    PsoVerifyCertificateOverFullTemplate psoVerifyCertificateOverFullTemplate
				    PsoVerifyCertificateOverValueFields
				    	psoVerifyCertificateOverValueFields,
				    PsoVerifyCertificateOverFullTemplate
				    	psoVerifyCertificateOverFullTemplate
				}
				with {
				    variant (psoCertificate) "fieldPresent=getIntTag('psoCommandTag')==0x92";
				    variant (psoVerifyCertificateOverValueFields) "fieldPresent=getIntTag('psoCommandTag')==0xae";
				    variant (psoVerifyCertificateOverFullTemplate) "fieldPresent=getIntTag('psoCommandTag')==0xbe";
				    variant (psoCertificate)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x92";
				    variant (psoVerifyCertificateOverValueFields)
				    	"fieldPresent=getIntTag('psoCommandTag')==0xae";
				    variant (psoVerifyCertificateOverFullTemplate)
				    	"fieldPresent=getIntTag('psoCommandTag')==0xbe";
				}
											 
				type octetstring PsoEncipher; 
				
				type union PsoDecipher {
				 	PsoCryptogramBerWithSmDataObject psoCryptogramBerWithSmDataObject,
				 	PsoCryptogramBerWithoutSmDataObject psoCryptogramBerWithoutSmDataObject,
				 	PsoCryptogramWithPaddingContentIndicator psoCryptogramWithPaddingContentIndicator  
				 	PsoCryptogramBerWithSmDataObject
				 		psoCryptogramBerWithSmDataObject,
				 	PsoCryptogramBerWithoutSmDataObject
				 		psoCryptogramBerWithoutSmDataObject,
				 	PsoCryptogramWithPaddingContentIndicator
				 		psoCryptogramWithPaddingContentIndicator  
				}
				with {
				    variant (psoCryptogramBerWithSmDataObject) "fieldPresent=getIntTag('psoCommandTag')==0x82";
				    variant (psoCryptogramBerWithoutSmDataObject) "fieldPresent=getIntTag('psoCommandTag')==0x84";
				    variant (psoCryptogramWithPaddingContentIndicator) "fieldPresent=getIntTag('psoCommandTag')==0x86";
				    variant (psoCryptogramBerWithSmDataObject)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x82";
				    variant (psoCryptogramBerWithoutSmDataObject)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x84";
				    variant (psoCryptogramWithPaddingContentIndicator)
				    	"fieldPresent=getIntTag('psoCommandTag')==0x86";
				}
				
				group PsoInputTemplates { // NOT TLVs !!