test case update summary

[Tim Hudson <tjh@cryptsoft.com>]

The details below match the two zip files just uploaded.

They contain changes from the interop testing based on discussions during the interop.

The majority of the changes are just fixing errors in new test cases which were being used for the first time.

Thanks,

Tim.

1) TC-REKEY-{9,10,11,12} - the Certify needs to use the PublicKey Object not the PrivateKey
2) TC-LOGIN-3-21 - missing the Operation in the response
3) TC-REKEY-12-21 - missing the RotateAutomatic and including two non-client-settable items
4) TC-ASYNC-5-21 - harmless consistency update (test case semantics unchanged)
5) TC-REKEY-7-21 - fixed the labels in the test case - harmless but incorrect
6) TC-REENCRYPT-3-21 - missing UniqueBatchItemID in one location
7) AKLC-M-3-21, SKLC-M-3-21 - modify attribute should use updated ReasonCode

diff --git a/data/2_1/tc-rekey-9-21.xml b/data/2_1/tc-rekey-9-21.xml
index c497942..794e36f 100644
--- a/data/2_1/tc-rekey-9-21.xml
+++ b/data/2_1/tc-rekey-9-21.xml
@@ -116,7 +116,7 @@
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Certify"/>
  Â<RequestPayload>
- Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_0"/>
+ Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_1"/>
   Â<CertificateRequestType type="Enumeration" value="PKCS_10"/>
   Â<CertificateRequest type="ByteString" value="3082028130820169020100303c310b3009060355040613025553310d300b060355040a130441434d45310d300b060355040b13044b4d4950310f300d06035504031306436c69656e7430820122300d06092a864886f70d01010105000382010f003082010a0282010100ab7f161c0042496ccd6c6d4dadb919973435357776003acf54b7af1e440afb80b64a8755f8002cfeba6b184540a2d66086d74648346d75b8d71812b205387c0f6583bc4d7dc7ec114f3b176b7957c422e7d03fc6267fa2a6f89b9bee9e60a1d7c2d833e5a5f4bb0b1434f4e795a41100f8aa214900df8b65089f98135b1c67b701675abdbc7d5721aac9d14a7f081fcec80b64e8a0ecc8295353c795328abf70e1b42e7bb8b7f4e8ac8c810cdb66e3d21126eba8da7d0ca34142cb76f91f013da809e9c1b7ae64c54130fbc21d80e9c2cb06c5c8d7cce8946a9ac99b1c2815c3612a29a82d73a1f99374fe30e54951662a6eda29c6fc411335d5dc7426b0f6050203010001a000300d06092a864886f70d010105050003820101002d90f5492c3df1771df4e87e1087cb952197319a9696e2d588efda580d8d3304427b997cd921ad7c674aea413fba85fd61e6a481de9ab2e8a4ff43c02655015d3437f783fe0c781519cd08ffd3c007c7fade9632fe5659e2cac35bd6aaf3e13dc18097d996df01b66fc5e26ca109380863a209125cc0fd79533f327fa1cad444d89d3ff81b92a91428c469c846090fd1324846e12d01671962c332a7826152daaf486cc867185c2e27caf2f009898db07fe4b45c518192aa493d8f8c0198db67f90672ab6de05a08032941377f473d80716d85adc6182003ab34942302214eb3895f15403f2616adfd6bb5e6aa47fa38c9dfc73f4de80ddb91bdb04d21c82ba6"/>
   Â<Attributes>


diff --git a/data/2_1/tc-rekey-10-21.xml b/data/2_1/tc-rekey-10-21.xml
index 96e50a4..4d55aa1 100644
--- a/data/2_1/tc-rekey-10-21.xml
+++ b/data/2_1/tc-rekey-10-21.xml
@@ -115,7 +115,7 @@
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Certify"/>
  Â<RequestPayload>
- Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_0"/>
+ Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_1"/>
   Â<CertificateRequestType type="Enumeration" value="PKCS_10"/>
   Â<CertificateRequest type="ByteString" value="3082028130820169020100303c310b3009060355040613025553310d300b060355040a130441434d45310d300b060355040b13044b4d49503
10f300d06035504031306436c69656e7430820122300d06092a864886f70d01010105000382010f003082010a0282010100ab7f161c0042496ccd6c6d4dadb919973435357776003acf54b7af1e440afb80b6
4a8755f8002cfeba6b184540a2d66086d74648346d75b8d71812b205387c0f6583bc4d7dc7ec114f3b176b7957c422e7d03fc6267fa2a6f89b9bee9e60a1d7c2d833e5a5f4bb0b1434f4e795a41100f8aa214
900df8b65089f98135b1c67b701675abdbc7d5721aac9d14a7f081fcec80b64e8a0ecc8295353c795328abf70e1b42e7bb8b7f4e8ac8c810cdb66e3d21126eba8da7d0ca34142cb76f91f013da809e9c1b7ae
64c54130fbc21d80e9c2cb06c5c8d7cce8946a9ac99b1c2815c3612a29a82d73a1f99374fe30e54951662a6eda29c6fc411335d5dc7426b0f6050203010001a000300d06092a864886f70d010105050003820
101002d90f5492c3df1771df4e87e1087cb952197319a9696e2d588efda580d8d3304427b997cd921ad7c674aea413fba85fd61e6a481de9ab2e8a4ff43c02655015d3437f783fe0c781519cd08ffd3c007c7
fade9632fe5659e2cac35bd6aaf3e13dc18097d996df01b66fc5e26ca109380863a209125cc0fd79533f327fa1cad444d89d3ff81b92a91428c469c846090fd1324846e12d01671962c332a7826152daaf486
cc867185c2e27caf2f009898db07fe4b45c518192aa493d8f8c0198db67f90672ab6de05a08032941377f473d80716d85adc6182003ab34942302214eb3895f15403f2616adfd6bb5e6aa47fa38c9dfc73f4d
e80ddb91bdb04d21c82ba6"/>
   Â<Attributes>

diff --git a/data/2_1/tc-rekey-11-21.xml b/data/2_1/tc-rekey-11-21.xml
index dec893a..60fa166 100644
--- a/data/2_1/tc-rekey-11-21.xml
+++ b/data/2_1/tc-rekey-11-21.xml
@@ -114,7 +114,7 @@
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Certify"/>
  Â<RequestPayload>
- Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_0"/>
+ Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_1"/>
   Â<CertificateRequestType type="Enumeration" value="PKCS_10"/>
   Â<CertificateRequest type="ByteString" value="3082028130820169020100303c310b3009060355040613025553310d300b060355040a130441434d45310d300b060355040b13044b4d49503
10f300d06035504031306436c69656e7430820122300d06092a864886f70d01010105000382010f003082010a0282010100ab7f161c0042496ccd6c6d4dadb919973435357776003acf54b7af1e440afb80b6
4a8755f8002cfeba6b184540a2d66086d74648346d75b8d71812b205387c0f6583bc4d7dc7ec114f3b176b7957c422e7d03fc6267fa2a6f89b9bee9e60a1d7c2d833e5a5f4bb0b1434f4e795a41100f8aa214
900df8b65089f98135b1c67b701675abdbc7d5721aac9d14a7f081fcec80b64e8a0ecc8295353c795328abf70e1b42e7bb8b7f4e8ac8c810cdb66e3d21126eba8da7d0ca34142cb76f91f013da809e9c1b7ae
64c54130fbc21d80e9c2cb06c5c8d7cce8946a9ac99b1c2815c3612a29a82d73a1f99374fe30e54951662a6eda29c6fc411335d5dc7426b0f6050203010001a000300d06092a864886f70d010105050003820
101002d90f5492c3df1771df4e87e1087cb952197319a9696e2d588efda580d8d3304427b997cd921ad7c674aea413fba85fd61e6a481de9ab2e8a4ff43c02655015d3437f783fe0c781519cd08ffd3c007c7
fade9632fe5659e2cac35bd6aaf3e13dc18097d996df01b66fc5e26ca109380863a209125cc0fd79533f327fa1cad444d89d3ff81b92a91428c469c846090fd1324846e12d01671962c332a7826152daaf486
cc867185c2e27caf2f009898db07fe4b45c518192aa493d8f8c0198db67f90672ab6de05a08032941377f473d80716d85adc6182003ab34942302214eb3895f15403f2616adfd6bb5e6aa47fa38c9dfc73f4d
e80ddb91bdb04d21c82ba6"/>
   Â<Attributes>

diff --git a/data/2_1/tc-rekey-12-21.xml b/data/2_1/tc-rekey-12-21.xml
index b96bae8..92392f0 100644
--- a/data/2_1/tc-rekey-12-21.xml
+++ b/data/2_1/tc-rekey-12-21.xml
@@ -109,7 +109,7 @@
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Certify"/>
  Â<RequestPayload>
- Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_0"/>
+ Â Â Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_1"/>
   Â<CertificateRequestType type="Enumeration" value="PKCS_10"/>
   Â<CertificateRequest type="ByteString" value="3082028130820169020100303c310b3009060355040613025553310d300b060355040a130441434d45310d300b060355040b13044b4d49503
10f300d06035504031306436c69656e7430820122300d06092a864886f70d01010105000382010f003082010a0282010100ab7f161c0042496ccd6c6d4dadb919973435357776003acf54b7af1e440afb80b6
4a8755f8002cfeba6b184540a2d66086d74648346d75b8d71812b205387c0f6583bc4d7dc7ec114f3b176b7957c422e7d03fc6267fa2a6f89b9bee9e60a1d7c2d833e5a5f4bb0b1434f4e795a41100f8aa214
900df8b65089f98135b1c67b701675abdbc7d5721aac9d14a7f081fcec80b64e8a0ecc8295353c795328abf70e1b42e7bb8b7f4e8ac8c810cdb66e3d21126eba8da7d0ca34142cb76f91f013da809e9c1b7ae
64c54130fbc21d80e9c2cb06c5c8d7cce8946a9ac99b1c2815c3612a29a82d73a1f99374fe30e54951662a6eda29c6fc411335d5dc7426b0f6050203010001a000300d06092a864886f70d010105050003820
101002d90f5492c3df1771df4e87e1087cb952197319a9696e2d588efda580d8d3304427b997cd921ad7c674aea413fba85fd61e6a481de9ab2e8a4ff43c02655015d3437f783fe0c781519cd08ffd3c007c7
fade9632fe5659e2cac35bd6aaf3e13dc18097d996df01b66fc5e26ca109380863a209125cc0fd79533f327fa1cad444d89d3ff81b92a91428c469c846090fd1324846e12d01671962c332a7826152daaf486
cc867185c2e27caf2f009898db07fe4b45c518192aa493d8f8c0198db67f90672ab6de05a08032941377f473d80716d85adc6182003ab34942302214eb3895f15403f2616adfd6bb5e6aa47fa38c9dfc73f4d
e80ddb91bdb04d21c82ba6"/>
   Â<Attributes>


diff --git a/data/2_1/tc-rekey-7-21.xml b/data/2_1/tc-rekey-7-21.xml
index 1cb20af..293297e 100644
--- a/data/2_1/tc-rekey-7-21.xml
+++ b/data/2_1/tc-rekey-7-21.xml
@@ -8,7 +8,7 @@
   Â<ProtocolVersionMajor type="Integer" value="2"/>
   Â<ProtocolVersionMinor type="Integer" value="1"/>
  Â</ProtocolVersion>
- Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-6-21 step=0"/>
+ Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-7-21 step=0"/>
  Â<BatchCount type="Integer" value="1"/>
 Â</RequestHeader>
 Â<BatchItem>
@@ -64,7 +64,7 @@
   Â<ProtocolVersionMajor type="Integer" value="2"/>
   Â<ProtocolVersionMinor type="Integer" value="1"/>
  Â</ProtocolVersion>
- Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-6-21 step=1"/>
+ Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-7-21 step=1"/>
  Â<BatchCount type="Integer" value="1"/>
 Â</RequestHeader>
 Â<BatchItem>
@@ -106,7 +106,7 @@
   Â<ProtocolVersionMajor type="Integer" value="2"/>
   Â<ProtocolVersionMinor type="Integer" value="1"/>
  Â</ProtocolVersion>
- Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-6-21 step=2"/>
+ Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-7-21 step=2"/>
  Â<BatchOrderOption type="Boolean" value="true"/>
  Â<BatchCount type="Integer" value="3"/>
 Â</RequestHeader>
@@ -189,7 +189,7 @@
   Â<ProtocolVersionMajor type="Integer" value="2"/>
   Â<ProtocolVersionMinor type="Integer" value="1"/>
  Â</ProtocolVersion>
- Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-6-21 step=3"/>
+ Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-7-21 step=3"/>
  Â<BatchOrderOption type="Boolean" value="true"/>
  Â<BatchCount type="Integer" value="2"/>
 Â</RequestHeader>
@@ -257,7 +257,7 @@
   Â<ProtocolVersionMajor type="Integer" value="2"/>
   Â<ProtocolVersionMinor type="Integer" value="1"/>
  Â</ProtocolVersion>
- Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-5-21 step=4"/>
+ Â Â<ClientCorrelationValue type="TextString" value="TC-REKEY-7-21 step=4"/>
  Â<BatchOrderOption type="Boolean" value="true"/>
  Â<BatchCount type="Integer" value="8"/>
 Â</RequestHeader>



diff --git a/data/2_1/tc-login-3-21.xml b/data/2_1/tc-login-3-21.xml
index 86d0915..91c2a7a 100644
--- a/data/2_1/tc-login-3-21.xml
+++ b/data/2_1/tc-login-3-21.xml
@@ -304,6 +304,7 @@
  Â<BatchCount type="Integer" value="1"/>
 Â</ResponseHeader>
 Â<BatchItem>
+ Â Â<Operation type="Enumeration" value="Query"/>
  Â<ResultStatus type="Enumeration" value="OperationFailed"/>
  Â<ResultReason type="Enumeration" value="UsageLimitExceeded"/>
  Â<ResultMessage type="TextString" value="Kmip"/>


diff --git a/data/2_1/tc-rekey-12-21.xml b/data/2_1/tc-rekey-12-21.xml
index e30fb8b..b96bae8 100644
--- a/data/2_1/tc-rekey-12-21.xml
+++ b/data/2_1/tc-rekey-12-21.xml
@@ -117,8 +117,7 @@
     Â<RotateNameValue type="TextString" value="TC-REKEY-12-21-Rotate-Name"/>
     Â<RotateNameType type="Enumeration" value="UninterpretedTextString"/>
    Â</RotateName>
- Â Â Â Â<RotateLatest type="Boolean" value="true"/>
- Â Â Â Â<RotateGeneration type="Integer" value="0"/>
+ Â Â Â <RotateAutomatic type="Boolean" value="true"/>
    Â<CryptographicUsageMask type="Integer" value="Verify Sign"/>
   Â</Attributes>
  Â</RequestPayload>


diff --git a/data/2_1/tc-async-5-21.xml b/data/2_1/tc-async-5-21.xml
index 95f170f..c3a8489 100644
--- a/data/2_1/tc-async-5-21.xml
+++ b/data/2_1/tc-async-5-21.xml
@@ -104,7 +104,7 @@
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Process"/>
  Â<RequestPayload>
- Â Â Â<AsynchronousCorrelationValue type="ByteString" value="$ASYNCHRONOUS_CORRELATION_VALUE"/>
+ Â Â Â<AsynchronousCorrelationValue type="ByteString" value="$ASYNCHRONOUS_CORRELATION_VALUE_0"/>
  Â</RequestPayload>
 Â</BatchItem>
Â</RequestMessage>
@@ -122,7 +122,7 @@
  Â<Operation type="Enumeration" value="Process"/>
  Â<ResultStatus type="Enumeration" value="Success"/>
  Â<ResponsePayload>
- Â Â Â<AsynchronousCorrelationValue type="ByteString" value="$ASYNCHRONOUS_CORRELATION_VALUE"/>
+ Â Â Â<AsynchronousCorrelationValue type="ByteString" value="$ASYNCHRONOUS_CORRELATION_VALUE_0"/>
  Â</ResponsePayload>
 Â</BatchItem>
Â</ResponseMessage>


diff --git a/data/2_1/tc-reencrypt-3-21.xml b/data/2_1/tc-reencrypt-3-21.xml
index e78286e..2de08b5 100644
--- a/data/2_1/tc-reencrypt-3-21.xml
+++ b/data/2_1/tc-reencrypt-3-21.xml
@@ -170,6 +170,7 @@
 Â</BatchItem>
 Â<BatchItem>
  Â<Operation type="Enumeration" value="Destroy"/>
+ Â Â<UniqueBatchItemID type="ByteString" value="07"/>
  Â<ResultStatus type="Enumeration" value="Success"/>
  Â<ResponsePayload>
   Â<UniqueIdentifier type="TextString" value="$UNIQUE_IDENTIFIER_1"/>


diff --git a/data/2_1/aklc-m-3-21.xml b/data/2_1/aklc-m-3-21.xml
index 0e2c005ef..eb0fb52b9 100644
--- a/data/2_1/aklc-m-3-21.xml
+++ b/data/2_1/aklc-m-3-21.xml
@@ -242,8 +242,8 @@
  Â<Operation type="Enumeration" value="ModifyAttribute"/>
  Â<UniqueBatchItemID type="ByteString" value="0752c951bb9926cc"/>
  Â<ResultStatus type="Enumeration" value="OperationFailed"/>
- Â Â<ResultReason type="Enumeration" value="PermissionDenied"/>
- Â Â<ResultMessage type="TextString" value="DENIED"/>
+ Â Â<ResultReason type="Enumeration" value="WrongKeyLifecycleState"/>
+ Â Â<ResultMessage type="TextString" value="ACTIVATION_DATE:!PRE_ACTIVE"/>
 Â</BatchItem>
Â</ResponseMessage>
Â
diff --git a/data/2_1/sklc-m-3-21.xml b/data/2_1/sklc-m-3-21.xml
index 2a303a208..25ddc56ea 100644
--- a/data/2_1/sklc-m-3-21.xml
+++ b/data/2_1/sklc-m-3-21.xml
@@ -227,8 +227,8 @@
  Â<Operation type="Enumeration" value="ModifyAttribute"/>
  Â<UniqueBatchItemID type="ByteString" value="0752c951bb9926cc"/>
  Â<ResultStatus type="Enumeration" value="OperationFailed"/>
- Â Â<ResultReason type="Enumeration" value="PermissionDenied"/>
- Â Â<ResultMessage type="TextString" value="DENIED"/>
+ Â Â<ResultReason type="Enumeration" value="WrongKeyLifecycleState"/>
+ Â Â<ResultMessage type="TextString" value="ACTIVATION_DATE:!PRE_ACTIVE"/>
 Â</BatchItem>
Â</ResponseMessage>
Â