Squashed commit of the following:

commit 9adf7ee Author: Kim O'Sullivan <[email protected]> Date: Fri Mar 4 21:45:58 2022 +1100 ASN1 examples cleanup commit 8b48fcc Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 21:28:46 2022 +1000 Added debug CAP file to build process commit 1f1f4db Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 21:11:19 2022 +1000 Added default PERMIT_MUTUAL attribute for Legacy operations commit 3f09f2e Merge: ac10def ac70f3f Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 20:36:47 2022 +1000 Merge branch 'feature/dynamic-configuration' of https://github.com/makinako/OpenFIPS201 into feature/dynamic-configuration commit ac70f3f Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 20:22:15 2022 +1000 Updates for v1.10.0 release commit a5dfcae Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 11:18:14 2022 +1000 Todo review and made random number generator mandatory commit aade529 Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 00:56:57 2022 +1000 Unit test bug fixes, contactless interface fix, PIV Test Runner passed commit de95d1a Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 00:51:45 2022 +1000 Revert "Unit test bug fixes, contactless interface fix, PIV Test Runner passed" This reverts commit cd024cc. commit cd024cc Author: Kim O'Sullivan <[email protected]> Date: Mon Apr 4 00:38:54 2022 +1000 Unit test bug fixes, contactless interface fix, PIV Test Runner passed commit ac10def Author: Kim O'Sullivan <[email protected]> Date: Fri Mar 4 17:08:04 2022 +1100 Tagged TODO commit 91ddc00 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 2 00:20:18 2022 +1100 Added PERMIT MUTUAL command, Merged Config and PIVConfig commit 45d11ff Author: Kim O'Sullivan <[email protected]> Date: Fri Apr 1 21:54:37 2022 +1100 Build environment and javadoc updates, removed underutilised Assert commit c409466 Author: Kim O'Sullivan <[email protected]> Date: Fri Apr 1 01:51:22 2022 +1100 Minor code cleanup, ASN.1 improvements commit fe56091 Author: Kim O'Sullivan <[email protected]> Date: Fri Mar 4 17:19:24 2022 +1100 Google java formatting and final scope review commit b8e7cc1 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 30 00:26:19 2022 +1100 Many review and feature additions, see description - Change hard pin/puk limit to 16, - PIN access refactor - Authenticated key state refactor - Class scope review - Added object attribute ADMIN_KEY - Removed key attribute ATTR_ADMIN (replaced with ADMIN_KEY) - Removed key role ROLE_SECURE_MESSAGING (replaced with KEY_ESTABLISH) commit fad96f3 Author: Kim O'Sullivan <[email protected]> Date: Sun Mar 27 23:53:34 2022 +1100 Implemented RESTRICT_SINGLE_KEY param, added pin rule verification, general cleanup commit d965063 Author: Kim O'Sullivan <[email protected]> Date: Thu Mar 24 17:07:51 2022 +1100 Fixed INS_ type typo commit 48202aa Author: Kim O'Sullivan <[email protected]> Date: Thu Mar 24 16:42:57 2022 +1100 Added PIN complexity rules, static analysis review, class scope review commit 61ea598 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 16:59:20 2022 +1100 SonarLint review and general cleanup commit fa045e6 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:58:04 2022 +1100 Applied google code formatting commit 3525cd9 Merge: 2253147 5791b8c Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:56:48 2022 +1100 Merged changes from master commit 2253147 Merge: 5fd4614 056a3e1 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:50:48 2022 +1100 Merge branch 'feature/dynamic-configuration' of https://github.com/makinako/OpenFIPS201 into feature/dynamic-configuration commit 5fd4614 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:50:45 2022 +1100 Update .gitignore commit cb5163d Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:49:22 2022 +1100 Update .gitignore commit 056a3e1 Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:48:25 2022 +1100 Delete unused trial proj file commit dcc79ca Author: Kim O'Sullivan <[email protected]> Date: Wed Mar 23 15:46:16 2022 +1100 Update .gitignore commit 10dfc72 Author: Kim O'Sullivan <[email protected]> Date: Thu Mar 3 15:42:59 2022 +1100 First draft with dynamic configuration completed (untested) commit e95c11c Author: Kim O'Sullivan <[email protected]> Date: Tue Mar 15 12:32:46 2022 +1100 v1.9.11 commit commit e06393e Author: Kim O'Sullivan <[email protected]> Date: Fri Mar 4 23:02:45 2022 +1100 Added initial dynamic config and updated put data admin
makinako · Apr 4, 2022 · 25cb2e6 · 25cb2e6
1 parent 5791b8c
commit 25cb2e6
Show file tree

Hide file tree

Showing 152 changed files with 13,963 additions and 3,351 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,12 @@
 ## Java
 ##
 
+# Asn1 Studio
+*.a1sproj
+
+# Sandbox Environment
+Sandbox/
+
 # Binary output
 bin/
 
@@ -25,6 +31,7 @@ hs_err_pid*
 
 # JCIDE build ignore
 JCIDE/
+.jcide
 .jcideslndata/
 .classpath
 .project

diff --git a/README.md b/README.md
@@ -1,8 +1,135 @@
 # OpenFIPS201 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-### **<u>UPDATE - 25th July 2021</u>**
+This project has been commissioned and funded by the Australian Department of Defence, to provide an open source implementation of the card application for the NIST Personal Identity Verification (PIV) standard as specified by [FIPS PUB 201-2](https://en.wikipedia.org/wiki/FIPS_201) and [SP800-73-4](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-73-4.pdf). 
+
+**OpenFIPS201 implements the following functionality:**
+* A flexible filesystem that can be defined easily without recompilation
+* A flexible key store that defines key roles instead of hard-coding which key is used for what function
+* It compiles to Javacard 3.0.4 as a minimum
+* Secure personalisation over SCP w/CEnc+CMac using the CHANGE REFERENCE DATA and PUT DATA commands
+* The following is out-of-scope at this time:
+  * Virtual Contact Interface
+  * Secure Messaging (Opacity)
+  * Biometric On-Card Comparison (OCC)
+
+To get started, please head on over to the [OpenFIPS201 Wiki](https://openfips201.atlassian.net/wiki/spaces/OD/overview)
+The latest binary release is: [OpenFIPS201 v1.10.0](#ref)
+
+**Want to get in touch?**
+
+Contact us at [email protected] if you want to talk about the project, or just to even say how you're using it!
+
+To contact the author directly, email [email protected]
+
+----
+
+
+
+### UPDATE 4th April 2022 - OpenFIPS201 v1.10.0 Release
+
+The latest revision of OpenFIPS201 is ready! Here are a few features and enhancements that have been added:
+
+
+#### Documentation
+
+Documentation relating to OpenFIPS201 has now been moved [here](https://openfips201.atlassian.net/wiki/spaces/OD/overview) to a public Confluence instance, as the docs were outgrowing the GitHub wiki. 
+
+
+#### *Dynamic Configuration**
+
+All `FEATURE` compilation constants are now gone and been replaced with a more extensive set of configuration registers for controlling aspects of applet behaviour. This means there is no longer a need to modify or build from source code in order to configure it.
+
+All configuration elements can be updated either individually, or batched into a single command (using OPTIONAL ASN.1 elements). If you choose not to update the configuration, you can just use the default values that have all been defined to adhere to PIV, or if PIV doesn't specify something then sensible default values have been used.
+
+#### Pre-Personalisation Interface
+
+The PUT DATA ADMIN command has changed a bit due to dynamic configuration. The following BER-TLV structures are defined:
+
+* Create Data Object
+* Delete Data Object (Defined but not implemented)
+* Create Key Command
+* Delete Key (Defined but not implemented)
+* Update Configuration
+* Legacy Operation
+
+Your current pre-perso will still work via the `Legacy Operation`, but you will not be able to take advantage of some of the extended features, notably dynamic configuration. We encourage you to migrate over to the new commands, which have been kept as similar as possible to ease the transition.
+
+
+#### Bulk Pre-Personalisation
+
+You can combine any number of the above pre-perso commands into the same APDU to reduce the command overheads of sending so many of them!
+
+The command is identical to the normal `PUT DATA ADMIN` format, with the exception that you have an outer BER-TLV tag that contains a SEQUENCE OF individual commands.
+
+You can also mix and match different kinds of updates in one (i.e. Keys, Data Objects and Config).
+
+#### PIN Enhancements
+
+The applet supports a number of additional useful enhancements to PIN functionality:
+
+* PIN Extended Length - You can define PIN lengths up to 16 digits in dynamic configuration
+* PIN Character Set - You can define PIN format requirements as either `numeric`, `alpha numeric`, `alpha numeric (case insensitive)` or `raw` (any byte value)
+* PIN History - You can configure the applet to remember up to the last 12 PIN values that were changed and prevent the user from re-using them.
+* PIN Complexity Rules - Two basic 'weak PIN' prevention rules have been added as optional parameters:
+  * Sequence Rule - Allows you to prevent more than `[n]` consecutive digits from being used (for example, 123456).
+  * Distinct Rule - Allows you to prevent more than [n] instances of the same character being used (for example, 111111).
+* PUK Retry Limits - PUK retries can now be defined in the same way PIN retries are (including separate counters for the Contact and Contactless interface). If the PUK is locked, it can only be unlocked by an administrative role over SCP03.
+
+<u>PIV Impacts:</u>
+
+- Setting the PIN Extended Length feature above 8 or below 6 will cause the padding/length to no longer comply with SP 800-73.
+- Setting the PIN Character Set to anything other than `numeric` will not work with any middleware that enforces numeric-only digits. 
+- PIN History and Complexity Rules should be transparent and simply result in an error condition that should be handled by PIV middleware / clients.
+
+#### Dynamic Admin Keys
+
+For each data object and asymmetric key, you can now optionally define which symmetric key is responsible for managing it. This gives you the capacity to give write / key generation access to targeted objects. This feature is optional and if you do not specify an admin key, objects will default to the`9B` key.
+
+<u>PIV Impact</u>: PIV defaults to the `9B` key as the administrative key, so to maintain compatibility, simply define this key or don't specify the key.
+
+#### User Manageable Data Objects
+
+For asymmetric keys and data objects, it is possible to now add the `User Admin` access mode privilege. If this is set, the data object can be written to, or the key generated as long as the access conditions for that card have been met. This can be separated for contact / contactless and the special 'always' access mode may not be paired with this.
+
+This has been included to permit the possibility of lower security applications whereby it is useful for regularly-changing operational data to be managed on the card without the requirement for administrative keys. Of course if the thought of this horrifies you, do nothing to your pre-perso scripts and the functionality will stay disabled.
+
+#### Optional Cryptographic Mechanisms
+
+The applet now attempts to instantiate all the required cryptographic mechanisms, but if there are any that it can't this now only results in those corresponding mechanisms being disabled, not prevention of the entire applet install.
+
+<u>PIV Impact:</u> None, provided the card is able to support at least one of the asymmetric key pair types.
+
+
+#### Other
+
+* The GlobalPlatform library now targets GP 2.2.1 instead of GP 2.1.1. This should not pose a problem for JC 3.0.4+ cards.
+* The `Admin` key attribute has now been deprecated as it replaced by the `adminKey` option
+* A `Permit Mutual` key attribute has been added for symmetric keys so it needs to be explicitly enabled. For legacy operations this attribute is automatically applied to maintain compatibility.
+* The discovery object is generated at run-time instead of applet compilation now, so you can change configuration parameters and it will reflect correctly.
+* `FEATURE_STRICT_APDU_CHAINING` has been removed as ISO7816 is pretty clear that you should be able to interrupt chained commands without an error. 
+* `FEATURE_DISCOVERY_OBJECT_DEFAULT` has been removed now that the discovery object generates every call.
+* `FEATURE_PIV_TEST_VECTORS` has been removed as it's usefulness reduced with ECC support and FIPS 140 doesn't like test values.
+* The `Options.restrictContactlessGlobal`configuration parameter has been added, which will make the applet non-selectable over the contactless interface.
+* The `Options.restrictContactlessAdmin` configuration parameter has been added, which prevents SCP03 administration over contactless.
+* The `Options.restrictSingleKey` configuration parameter has been added, which will prevent the applet from allowing the same key to be defined with multiple mechanisms.
+* `GET STATUS` and `GET VERSION` are improved (more additions and improvements will follow in the coming months, but compatibility with the current response bytes will be maintained so don't hard-code length requirements into your code!).
+* Lots of other background changes, code review changes, etc.
+
+
+
+[Discussions](https://github.com/makinako/OpenFIPS201/discussions) has now been enabled, we welcome any feedback you have!
+
+
+
+----
+
+
+
+### UPDATE - 25th July 2021
+
 The applet has been updated (and will continue to be) over the next few months for accreditation.
 Below is a summary of changes, with wiki updates to follow shortly:
+
 - General review for FIPS 140-3 + Static analysis + all General Authenticate cases
 - Splitting of General Authenticate, which was getting too complex.
 - Changes to Key Roles and addition of Key Attributes (compatibility break for pre-perso!)
@@ -16,12 +143,18 @@ Below is a summary of changes, with wiki updates to follow shortly:
 
 Note that because of [issue #29](https://github.com/makinako/OpenFIPS201/issues/29) there is a minor breaking change to the pre-personalisation interface. Details are in the comments and will be updated in the documentation. Feedback is still sought on whether this can be improved as things are flexible up until validation starts.
 
+----
+
+
+
 ### **<u>UPDATE - 23th April 2021</u>**
+
 Things have been a bit quiet here, but behind the scenes we are in the process of preparing OpenFIPS201 for CMVP / FIPS 140-3 accreditation! 
 
 This is a very steep learning curve, but out of the process is coming a number of changes that will need to be made to the applet in order to comply with direct requirements or smooth the way through the process. In the next few weeks, I'll be adding these to the issues register to open up the changes to discussion, as some of the changes will impact pre-personalisation and configuration (whilst of course maintaining compatibility with the actual PIV spec).
 
 The (somewhat simplified) phases of accreditation are:
+
 - **Feature Completion** - We are now implementing Secure Messaging, Pairing Code and VCI functionality. This will nearly complete all optional features of the PIV specification, with the notable exception of Biometric On-Card Comparison (OCC). The aim is to have as much as we can in, to avoid the need for re-validation.
 - **CMVP Research** - In parallel, we are in the process of understanding the CMVP/FIPS requirements, contacting labs and producing an internally generated gap analysis. 
 - **Design, Documentation and Testing** - There are specific documentary requirements for FIPS 140-3, some of which we won't know until we engage the lab.
@@ -34,45 +167,28 @@ One additional aspect, because this is a PIV implementation is that we will also
 
 If you have any specific questions or issues, please raise them on the issues list or contact us at [email protected].
 
+----
+
+
 
 ### **<u>UPDATE - 27th August 2020</u>**
+
 Thanks largely to the efforts of [@dmercer-google](https://github.com/dmercer-google) we now have support for Elliptic Curve! You can now generate key objects with ECC256 (#11) and ECC384 (#14) mechanisms and make use of them in General Authenticate for authentication, signing and key establishment. VCI / SM is not yet included in this, but watch this space. Thanks Dave!
 
+----
+
+
+
 
 ### **<u>UPDATE - 22nd July 2020</u>**
 
 OpenFIPS201 has attempted to maintain compatibility with Javacard 2.2.x, however it is clear that there are a number of very good reasons to move away from it in the context of the PIV standard:
+
 * There are a number of cryptographic primitives that are not supported by JC22, especially in the Elliptic Curve domain. This makes it impossible to fully implement SP800-73-4. 
 * The PIV requirement to format signature input blocks off-card, which is not supported by JC22 resulted in the need to implement a hack to encrypt using the private key. Moving to JC30 will allow the use of Signature with 'signPreComputedHash()' and 'setInitialDigest', which are both specifically intended for off-card signature block formatting.
 * JC22 does not support the 'Applet.reselectingApplet()' feature, which again is a breaking point for PIV. NIST have indicated they will permit certification exceptions to support JC22 cards, however this hasn't been tested to our knowledge.
 
 Going forward, OpenFIPS201 will target Javacard SDK 3.0.4 as a minimum. To continue to support Javacard 2.2.x we have added a new repository [OpenFIPS201-jc22](https://github.com/makinako/OpenFIPS201-jc22), which will serve as the compatibility release going forward.
 
----
-
-# OpenFIPS201
+----
 
-This project has been commissioned and funded by the Australian Department of Defence, to provide an open source implementation of the card application for the NIST Personal Identity Verification (PIV) standard as specified by [FIPS PUB 201-2](https://en.wikipedia.org/wiki/FIPS_201) and [SP800-73-4](http://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-73-4.pdf). 
-
-**OpenFIPS201 implements the following functionality:**
-
-* A flexible filesystem that can be defined easily without recompilation
-* A flexible key store that defines key roles instead of hard-coding which key is used for what function
-* It compiles to Javacard 3.0.4 as a minimum
-* Secure personalisation over SCP w/CEnc+CMac using the CHANGE REFERENCE DATA and PUT DATA commands
-* The following is out-of-scope at this time:
-  * Virtual Contact Interface
-  * Secure Messaging (Opacity)
-  * Biometric On-Card Comparison (OCC)
-
-
-To get started, please head on over to the [OpenFIPS201 Wiki](https://github.com/makinako/OpenFIPS201/wiki)
-
-The latest binary release is: [OpenFIPS201 v1.0.0-beta6](https://github.com/makinako/OpenFIPS201/releases/tag/v1.0.0-beta6)
-
-
-**Want to get in touch?**
-
-Contact us at [email protected] if you want to talk about the project, or just to even say how you're using it!
-
-To contact the author directly, email [email protected]
diff --git a/build/build.xml b/build/build.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="OpenFIPS201 PIV Applet" default="all" basedir="..">
 
-  <property name="jc.version" value="jc304"/>
-  <property name="gp.version" value="gp211"/>
+  <property name="VERSION_MAJOR" value="1"/>
+  <property name="VERSION_MINOR" value="10"/>
+  <property name="VERSION_REVISION" value="0"/>
+  <property name="SDK_BASE" value="tools/sdk"/>
+  <property name="BUILD_SDK" value="${SDK_BASE}/jc310"/>
+  <property name="TARGET_SDK" value="${SDK_BASE}/jc304"/>
 
+  <property name="gp.version" value="gp221"/>
 
-  <property name="jc.home" value="${basedir}/tools/sdk/${jc.version}"/>  
+  <property name="jc.home" value="${BUILD_SDK}"/>
   <property name="gp.home" value="${basedir}/tools/sdk/${gp.version}"/>
   <property name="gp.exportjar" value="${gp.home}/${gp.version}.jar"/>
 
-  <property name="build.version" value="1.2"/>
+  <property name="build.version" value="${VERSION_MAJOR}.${VERSION_MINOR}"/>
   <property name="build.sourcepath" value="src"/>
   <property name="build.outputpath" value="build/bin"/>
-  <property name="build.outputfile" value="OpenFIPS201-v${build.version}.cap"/>
-
+  <property name="build.outputfile" value="OpenFIPS201-v${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_REVISION}.cap"/>
+  <property name="build.outputfile_debug" value="OpenFIPS201-v${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_REVISION}-DEBUG.cap"/>
   <property name="docs.outputpath" value="build/docs"/>
-  <property name="docs.classpath" value="${jc.home}/lib/api_classic.jar;${gp.exportjar}"/>
+  <property name="docs.classpath" value="${BUILD_SDK}/lib/api_classic-3.0.4.jar;${gp.exportjar}"/>
 
   <target name="clean">
     <delete dir="${build.outputpath}"/>
@@ -26,16 +31,20 @@
     <mkdir dir="${build.outputpath}" />
     <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="tools/ant-javacard.jar"/>
     <javacard>
-      <cap aid="A00000030800001000" output="${build.outputpath}/${build.outputfile}" sources="${build.sourcepath}" version="${build.version}">
-        <applet class="com.makina.security.OpenFIPS201.OpenFIPS201" aid="A000000308000010000100"/>
+      <cap targetsdk="${TARGET_SDK}" aid="A00000030800001000" output="${build.outputpath}/${build.outputfile}" sources="${build.sourcepath}" version="${build.version}">
+        <applet class="com.makina.security.openfips201.OpenFIPS201" aid="A000000308000010000100"/>
+        <import exps="${gp.home}" jar="${gp.exportjar}"/>
+      </cap>
+      <cap debug="true" targetsdk="${TARGET_SDK}" aid="A00000030800001000" output="${build.outputpath}/${build.outputfile_debug}" sources="${build.sourcepath}" version="${build.version}">
+        <applet class="com.makina.security.openfips201.OpenFIPS201" aid="A000000308000010000100"/>
         <import exps="${gp.home}" jar="${gp.exportjar}"/>
       </cap>
     </javacard>
   </target>
 
   <target name="doc" depends="compile">
     <mkdir dir="${docs.outputpath}" />
-    <javadoc packagenames="src" sourcepath="${build.sourcepath}" destdir="${docs.outputpath}" classpath="${docs.classpath}" linksource="yes">
+    <javadoc access="private" packagenames="src" sourcepath="${build.sourcepath}" destdir="${docs.outputpath}" classpath="${docs.classpath}" linksource="yes">
       <fileset dir="${build.sourcepath}">
         <include name="**" />
       </fileset>

diff --git a/doc/asn1/GetStatusResponse.ber b/doc/asn1/GetStatusResponse.ber
diff --git a/doc/asn1/GetVersionResponse.ber b/doc/asn1/GetVersionResponse.ber
diff --git a/doc/asn1/NIST-PUT_DATA_CONFIG.ber b/doc/asn1/NIST-PUT_DATA_CONFIG.ber
diff --git a/doc/asn1/NIST-PUT_DATA_DATA_OBJECTS_01.ber b/doc/asn1/NIST-PUT_DATA_DATA_OBJECTS_01.ber
diff --git a/doc/asn1/NIST-PUT_DATA_DATA_OBJECTS_02.ber b/doc/asn1/NIST-PUT_DATA_DATA_OBJECTS_02.ber
diff --git a/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_01.ber b/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_01.ber
diff --git a/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_02.ber b/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_02.ber
diff --git a/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_03.ber b/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_03.ber
diff --git a/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_04.ber b/doc/asn1/NIST-PUT_DATA_KEY_OBJECTS_04.ber
diff --git a/doc/asn1/OpenFIPS201-CHANGE-REFERENCE-DATA.asn b/doc/asn1/OpenFIPS201-CHANGE-REFERENCE-DATA.asn
@@ -0,0 +1,20 @@
+OpenFIPS201_CHANGE_REFERENCE_DATA_ADMIN_Schema DEFINITIONS IMPLICIT TAGS ::= 
+BEGIN
+
+ChangeReferenceDataKeyRequest ::= SEQUENCE {
+	element CHOICE	{
+		key		[0] OCTET STRING (SIZE(16..32)),
+		rsaN	[1] OCTET STRING (SIZE(128..256)),
+		rsaE	[2] OCTET STRING (SIZE(3)),
+		rsaP	[3] OCTET STRING (SIZE(128..256)),
+		rsaQ	[4] OCTET STRING (SIZE(64..128)),
+		rsaDP	[5] OCTET STRING (SIZE(64..128)),
+		rsaDQ	[6] OCTET STRING (SIZE(64..128)),
+		rsaPQ	[7] OCTET STRING (SIZE(64..128)),
+		eccW	[8] OCTET STRING (SIZE(32..48)),
+		eccS	[9] OCTET STRING (SIZE(32..48)),
+		smCVC	[10] OCTET STRING (SIZE(1..256))
+	}
+}
+
+END
diff --git a/doc/asn1/OpenFIPS201-GET-STATUS.asn b/doc/asn1/OpenFIPS201-GET-STATUS.asn
@@ -0,0 +1,21 @@
+OpenFIPS201_GET_STATUS_Schema DEFINITIONS IMPLICIT TAGS ::= 
+BEGIN
+
+AppletState ::= ENUMERATED {
+	selectable	 	(0),
+	personalised	(1),
+	blocked 		(2),
+	terminated  	(127)
+}
+
+GetStatusResponse ::= [APPLICATION 19] SEQUENCE {
+	appletState		[0] AppletState,
+	pinVerified		[1] BOOLEAN,
+	pinAlways		[2] BOOLEAN,
+	smState			[3] BOOLEAN,
+	vciState		[4] BOOLEAN,
+	scpState		[5] BOOLEAN,
+	contactless		[6] BOOLEAN
+}
+
+END
diff --git a/doc/asn1/OpenFIPS201-GET-VERSION.asn b/doc/asn1/OpenFIPS201-GET-VERSION.asn
@@ -0,0 +1,13 @@
+OpenFIPS201_GET_VERSION_Schema DEFINITIONS IMPLICIT TAGS ::= 
+BEGIN
+
+GetVersionResponse ::= [APPLICATION 19] SEQUENCE {
+	application	[0] UTF8String (SIZE(0..127)),
+	major		[1] INTEGER (0..127),
+	minor		[2] INTEGER (0..127),
+	revision	[3] INTEGER (0..127),
+	debug		[4] BOOLEAN,
+	fipsMode	[5] BOOLEAN	
+}
+
+END