Skip to content

Commit 1e5de53

Browse files
robertmclemonsrobertmclemons
committed
Minor changes to COP.1/KeyEncap to align w/ catalog
1 parent 744f0f9 commit 1e5de53

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

‎input/gpcp.xml‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,9 +1927,9 @@
19271927
</selectables></col>
19281928
<col>KPF2 - KDF in Counter Mode using <selectables>
19291929
<selectable id="sel-fcs-ckm-5-kdf-ctr-cmac">AES-256-CMAC</selectable>
1930-
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">>HMAC-SHA-256</selectable>
1931-
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">>HMAC-SHA-384</selectable>
1932-
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac512">>HMAC-SHA-512</selectable>
1930+
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">HMAC-SHA-256</selectable>
1931+
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">HMAC-SHA-384</selectable>
1932+
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac512">HMAC-SHA-512</selectable>
19331933
</selectables> as the PRF</col>
19341934
<col><selectables>
19351935
<selectable>256</selectable>
@@ -1951,9 +1951,9 @@
19511951
</selectables></col>
19521952
<col>KPF3 - KDF in Feedback Mode using <selectables>
19531953
<selectable id="sel-fcs-ckm-5-kdf-fb-cmac">AES-256-CMAC</selectable>
1954-
<selectable id="sel-fcs-ckm-5-kdf-fb-hmac256">>HMAC-SHA-256</selectable>
1955-
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">>HMAC-SHA-384</selectable>
1956-
<selectable id="sel-fcs-ckm-5-kdf-fb-hmac512">>HMAC-SHA-512</selectable>
1954+
<selectable id="sel-fcs-ckm-5-kdf-fb-hmac256">HMAC-SHA-256</selectable>
1955+
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">HMAC-SHA-384</selectable>
1956+
<selectable id="sel-fcs-ckm-5-kdf-fb-hmac512">HMAC-SHA-512</selectable>
19571957
</selectables> as the PRF</col>
19581958
<col><selectables>
19591959
<selectable>256</selectable>
@@ -1974,9 +1974,9 @@
19741974
</selectables></col>
19751975
<col>KDF in Double Pipeline Iteration Mode using <selectables>
19761976
<selectable id="sel-fcs-ckm-5-kdf-dpi-cmac">AES-256-CMAC</selectable>
1977-
<selectable id="sel-fcs-ckm-5-kdf-dpi-hmac256">>HMAC-SHA-256</selectable>
1978-
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">>HMAC-SHA-384</selectable>
1979-
<selectable id="sel-fcs-ckm-5-kdf-dpi-hmac512">>HMAC-SHA-512</selectable>
1977+
<selectable id="sel-fcs-ckm-5-kdf-dpi-hmac256">HMAC-SHA-256</selectable>
1978+
<selectable id="sel-fcs-ckm-5-kdf-ctr-hmac256">HMAC-SHA-384</selectable>
1979+
<selectable id="sel-fcs-ckm-5-kdf-dpi-hmac512">HMAC-SHA-512</selectable>
19801980
</selectables> as the PRF</col>
19811981
<col><selectables>
19821982
<selectable>256</selectable>
@@ -2983,11 +2983,18 @@
29832983
<aactivity>
29842984
<TSS>
29852985
The evaluator shall examine the TSS to ensure that it describes the construction of any IVs,
2986-
nonces, and tags in conformance with the relevant specifications.
2986+
nonces, and tags in conformance with the relevant specifications.<h:p/>
2987+
If a CCM mode algorithm is selected, then the evaluator shall examine the TOE summary
2988+
specification to confirm that it describes how the nonce is generated and that the same nonce is
2989+
never reused to encrypt different plaintext pairs under the same key.<h:p/>
2990+
If a GCM mode algorithm is selected, then the evaluator shall examine the TOE summary
2991+
specification to confirm that it describes how the IV is generated and that the same IV is never
2992+
reused to encrypt different plaintext pairs under the same key. The evaluator shall also confirm
2993+
that for each invocation of GCM, the length of the plaintext is at most (2<h:sup>32</h:sup>)-2 blocks.
29872994
</TSS>
29882995
<Guidance/>
29892996
<Tests>
2990-
The following tests require the developer to provide access to a test platform that
2997+
The following tests may require the developer to provide access to a test platform that
29912998
provides the evaluator with tools that are typically not found on factory products.<h:p/>
29922999
The following tests are conditional based upon the selections made in the SFR. The
29933000
evaluator shall perform the following test or witness respective tests executed by
@@ -3152,7 +3159,7 @@
31523159
</TSS>
31533160
<Guidance/>
31543161
<Tests>
3155-
The following tests require the developer to provide access to a test platform that
3162+
The following tests may require the developer to provide access to a test platform that
31563163
provides the evaluator with tools that are typically not found on factory products.<h:p/>
31573164
The following tests are conditional based upon the selections made in the SFR. The
31583165
evaluator shall perform the following test or witness respective tests executed by
@@ -3275,7 +3282,7 @@
32753282
</TSS>
32763283
<Guidance/>
32773284
<Tests>
3278-
The following tests require the developer to provide access to a test platform that
3285+
The following tests may require the developer to provide access to a test platform that
32793286
provides the evaluator with tools that are typically not found on factory products.<h:p/>
32803287
The following tests are conditional based upon the selections made in the SFR. The
32813288
evaluator shall perform the following test or witness respective tests executed by
@@ -3545,19 +3552,19 @@
35453552

35463553
<selectable id="sel-fcs-cop-keyencap-kas1">
35473554
<col>KAS1</col>
3548-
<col>KAS1 [RSA-single party]</col>
3555+
<col>RSASVE</col>
35493556
<col><selectables>
35503557
<selectable>3072</selectable>
35513558
<selectable>4096</selectable>
35523559
<selectable>6144</selectable>
35533560
<selectable>8192</selectable>
35543561
</selectables> bits</col>
3555-
<col>NIST SP 800-56B Revision 2 (Sections 6.3 and 8.2)</col>
3562+
<col>NIST SP 800-56B Revision 2 (Section 7.2.1)</col>
35563563
</selectable>
35573564

35583565
<selectable id="sel-fcs-cop-keyencap-kts">
35593566
<col>KTS-OAEP</col>
3560-
<col>KTS-OAEP [RSA-OAEP]</col>
3567+
<col>RSA-OAEP</col>
35613568
<col><selectables>
35623569
<selectable>3072</selectable>
35633570
<selectable>4096</selectable>
@@ -3590,7 +3597,7 @@
35903597
</TSS>
35913598
<Guidance/>
35923599
<Tests>
3593-
The following tests require the developer to provide access to a test platform that
3600+
The following tests may require the developer to provide access to a test platform that
35943601
provides the evaluator with tools that are typically not found on factory products.<h:p/>
35953602
The following tests are conditional based upon the selections made in the SFR. The
35963603
evaluator shall perform the following test or witness respective tests executed by
@@ -3601,7 +3608,7 @@
36013608
environment and TOE execution environment shall be described.<h:p/>
36023609

36033610
<!-- KAS1 -->
3604-
<h:br/><h:b>KAS1 [RSA-single party]</h:b><h:p/>
3611+
<h:br/><h:b>KAS1 [RSASVE single-party]</h:b><h:p/>
36053612
<h:table border="1">
36063613
<h:tr class="header" bgcolor="#cccccc">
36073614
<h:td valign="top">Identifier</h:td>
@@ -3611,21 +3618,21 @@
36113618
</h:tr>
36123619
<h:tr>
36133620
<h:td valign="top">KAS1</h:td>
3614-
<h:td valign="top">KAS1 [RSA-single party]</h:td>
3621+
<h:td valign="top">RSASVE</h:td>
36153622
<h:td valign="top">[<h:b>selection:</h:b> 3072, 4096, 6144, 8192] bits</h:td>
3616-
<h:td valign="top">NIST SP 800-56B Revision 2 (Sections 6.3 &amp; 8.2)</h:td>
3623+
<h:td valign="top">NIST SP 800-56B Revision 2 (Section 7.2.1)</h:td>
36173624
</h:tr>
36183625
</h:table><h:p/>
3619-
To test the TOE’s implementation of the of KAS1 RSA Single-Party Key Encapsulation, the
3626+
To test the TOE’s implementation of the of KAS1 RSASVE Single-Party Key Encapsulation, the
36203627
evaluator shall perform the Algorithm Functional Test and Validation Test using the following
36213628
input parameters:<h:ul>
36223629
<h:li>RSA Private key format [Basic with fixed public exponent, Prime Factor with fixed
36233630
public exponent, Chinese Remainder Theorem with fixed public exponent, Basic with
36243631
random public exponent, Prime Factor with random public exponent, Chinese
36253632
Remainder Theorem with random public exponent]</h:li>
3626-
<h:li>Modulus value [3072, 4096, 6144, 8192]</h:li>
3633+
<h:li>Modulo value [3072, 4096, 6144, 8192]</h:li>
36273634
<h:li>Role [initiator, responder]</h:li>
3628-
<h:li>Key confirmation supported [yes, no] [not included in KAS2]</h:li></h:ul><h:p/>
3635+
<h:li>Key confirmation supported [yes, no]</h:li></h:ul><h:p/>
36293636
The evaluator shall generate a test group (i.e. set of tests) for each parameter value of the above
36303637
parameter type with the largest number of supported values. For example, if the TOE supports all
36313638
six key formats, then the evaluator shall generate six test groups. Each of the above supported
@@ -3662,7 +3669,7 @@
36623669
</h:tr>
36633670
<h:tr>
36643671
<h:td valign="top">KTS-OAEP</h:td>
3665-
<h:td valign="top">KTS-OAEP [RSA-OAEP]</h:td>
3672+
<h:td valign="top">RSA-OAEP</h:td>
36663673
<h:td valign="top">[<h:b>selection:</h:b> 3072, 4096, 6144, 8192] bits</h:td>
36673674
<h:td valign="top">NIST SP 800-56B Revision 2 (Sections 6.3 &amp; 9)</h:td>
36683675
</h:tr>

0 commit comments

Comments
 (0)