Merge pull request cose-wg#74 from jimsch/master

jimsch · web-flow · commit 54043925dcf9 · 2016-10-18T17:13:34.000-07:00
Update examples to deal with deterministic ECDSA
diff --git a/ecdsa-examples/ecdsa-01.json b/ecdsa-examples/ecdsa-01.json
@@ -25,10 +25,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -38,7 +35,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18']]])",
-     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18"
+     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258']]])",
+     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258"
    }
  }
diff --git a/ecdsa-examples/ecdsa-02.json b/ecdsa-examples/ecdsa-02.json
@@ -22,10 +22,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "6385EF5ECB18BE84EB57B41F367DA899A26EB19CADBD0EE729F6AE232B5D7B7C1C80506BA3BAB86ABD6A988D6460D53E"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -35,7 +32,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013822', {4: h'50333834'}, h'B8F85EFF78C88F5351CED2F1887B79B296490795594B62E41E22529BB90208B7D8CDDD4A46D0E9C986464D83D0A5D1ED8D8062F00BBCB95CF61ADE77E14A8012DC3CC6CFF122F05DA0D469989BE86655BBC66ED89F6EBEF69143DA0C404B1397']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013822A10444503338345860B8F85EFF78C88F5351CED2F1887B79B296490795594B62E41E22529BB90208B7D8CDDD4A46D0E9C986464D83D0A5D1ED8D8062F00BBCB95CF61ADE77E14A8012DC3CC6CFF122F05DA0D469989BE86655BBC66ED89F6EBEF69143DA0C404B1397"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013822', {4: h'50333834'}, h'230DF24B9F31DD2D7D1B9C33CE59073FC21E02BB63DC55847626B5B7F43905D59ACC186890BC1FE8B6D12E61B0373FFBA131ECC6C21958CDFF28AD77E0C32F9A0C6CA247135F538496228B2BE5557E7DBD7280DB24B46B68C0772D1BAEF09DE5']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013822A10444503338345860230DF24B9F31DD2D7D1B9C33CE59073FC21E02BB63DC55847626B5B7F43905D59ACC186890BC1FE8B6D12E61B0373FFBA131ECC6C21958CDFF28AD77E0C32F9A0C6CA247135F538496228B2BE5557E7DBD7280DB24B46B68C0772D1BAEF09DE5"
    }
  }
diff --git a/ecdsa-examples/ecdsa-03.json b/ecdsa-examples/ecdsa-03.json
@@ -23,10 +23,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "1B467A82686FDA8AFB59D5915781DF34933A90267FA59381E554C9B7CB54D25139355BFC2674B7E24C376E81B58DFD685258EC1897D087D3A53E22A1E08BD6E72E05"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -36,7 +33,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65'}, h'000F348009BADC7DA478150AA7FA06DFD812CDF826344F17C7330563573D8F97F7A966924C3D88B108907235476E3F6BEA9F3890027792B0F94E905C217227CF064E01342ADF0C1B428CEEADB135D249526D972163B43847E2720A576D2CE82FBD4E1C450E289D5B2515B5B81427097F584D3C4679CC3C17012B9C3BE4D5FAB5626CAA12']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A104581E62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C655884000F348009BADC7DA478150AA7FA06DFD812CDF826344F17C7330563573D8F97F7A966924C3D88B108907235476E3F6BEA9F3890027792B0F94E905C217227CF064E01342ADF0C1B428CEEADB135D249526D972163B43847E2720A576D2CE82FBD4E1C450E289D5B2515B5B81427097F584D3C4679CC3C17012B9C3BE4D5FAB5626CAA12"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65'}, h'00A2D28A7C2BDB1587877420F65ADF7D0B9A06635DD1DE64BB62974C863F0B160DD2163734034E6AC003B01E8705524C5C4CA479A952F0247EE8CB0B4FB7397BA08D009E0C8BF482270CC5771AA143966E5A469A09F613488030C5B07EC6D722E3835ADB5B2D8C44E95FFB13877DD2582866883535DE3BB03D01753F83AB87BB4F7A0297']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A104581E62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65588400A2D28A7C2BDB1587877420F65ADF7D0B9A06635DD1DE64BB62974C863F0B160DD2163734034E6AC003B01E8705524C5C4CA479A952F0247EE8CB0B4FB7397BA08D009E0C8BF482270CC5771AA143966E5A469A09F613488030C5B07EC6D722E3835ADB5B2D8C44E95FFB13877DD2582866883535DE3BB03D01753F83AB87BB4F7A0297"
    }
  }
diff --git a/ecdsa-examples/ecdsa-04.json b/ecdsa-examples/ecdsa-04.json
@@ -22,10 +22,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -35,7 +32,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E146C68CD768B378C09F707FFE314586E262871350620AC0725ADDA29C6CCC7C10']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E146C68CD768B378C09F707FFE314586E262871350620AC0725ADDA29C6CCC7C10"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'3131'}, h'0CA5877D333B8E68B917551F947E0977BD3C70D416FDE3F9BB6A30CCBB96E875D0941FF22C5DB4087124FB1981A88B2B34C7EE2827679B1318272C3D62622CC8']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A10442313158400CA5877D333B8E68B917551F947E0977BD3C70D416FDE3F9BB6A30CCBB96E875D0941FF22C5DB4087124FB1981A88B2B34C7EE2827679B1318272C3D62622CC8"
    }
  }
diff --git a/sign-tests/ecdsa-01.json b/sign-tests/ecdsa-01.json
@@ -25,10 +25,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -38,7 +35,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18']]])",
-     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18"
+     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258']]])",
+     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258"
    }
  }
diff --git a/sign-tests/sign-fail-01.json b/sign-tests/sign-fail-01.json
@@ -26,10 +26,7 @@
      "failures":{
        "ChangeCBORTag":998
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -39,7 +36,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"998([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",
-     "cbor":"D903E68440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"998([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",
+     "cbor":"D903E68440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/sign-tests/sign-fail-02.json b/sign-tests/sign-fail-02.json
@@ -26,10 +26,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -39,7 +36,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE1']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE1"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30B']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30B"
    }
  }
diff --git a/sign-tests/sign-fail-03.json b/sign-tests/sign-fail-03.json
@@ -28,10 +28,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -41,7 +38,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013903E6', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818345A1013903E6A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013903E6', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818345A1013903E6A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/sign-tests/sign-fail-04.json b/sign-tests/sign-fail-04.json
@@ -28,10 +28,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -41,7 +38,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10167756E6B6E6F776E', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E81834AA10167756E6B6E6F776EA1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10167756E6B6E6F776E', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E81834AA10167756E6B6E6F776EA1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/sign-tests/sign-fail-06.json b/sign-tests/sign-fail-06.json
@@ -28,10 +28,7 @@
          "ctyp":0
        }
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -41,7 +38,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",
-     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",
+     "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/sign-tests/sign-fail-07.json b/sign-tests/sign-fail-07.json
@@ -31,10 +31,7 @@
          "ctyp":0
        }
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -44,7 +41,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'A0', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18']]])",
-     "cbor":"D903DF8441A0A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18"
+     "cbor_diag":"991([h'A0', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258']]])",
+     "cbor":"D903DF8441A0A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258"
    }
  }
diff --git a/sign-tests/sign-pass-01.json b/sign-tests/sign-pass-01.json
@@ -25,10 +25,7 @@
      "failures":{
        "ChangeProtected":"a0"
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -38,7 +35,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'A0', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",
-     "cbor":"D903DF8441A0A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"991([h'A0', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",
+     "cbor":"D903DF8441A0A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/sign-tests/sign-pass-02.json b/sign-tests/sign-pass-02.json
@@ -23,10 +23,7 @@
          }
        ]
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -36,7 +33,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E18793007A75771850E851D2DDB5DF9C721078F7F093634314971F00463B488D7C']]])",
-     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E18793007A75771850E851D2DDB5DF9C721078F7F093634314971F00463B488D7C"
+     "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'CBB8DAD9BEAFB890E1A414124D8BFBC26BEDF2A94FCB5A882432BFF6D63E15F574EEB2AB51D83FA2CBF62672EBF4C7D993B0F4C2447647D831BA57CCA86B930A']]])",
+     "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840CBB8DAD9BEAFB890E1A414124D8BFBC26BEDF2A94FCB5A882432BFF6D63E15F574EEB2AB51D83FA2CBF62672EBF4C7D993B0F4C2447647D831BA57CCA86B930A"
    }
  }
diff --git a/sign-tests/sign-pass-03.json b/sign-tests/sign-pass-03.json
@@ -25,10 +25,7 @@
      "failures":{
        "RemoveCBORTag":1
      },
-     "rng_description":"seed for signature",
-     "rng_stream":[
-       "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"
-     ]
+     "rng_description":"seed for signature"
    },
    "intermediates":{
      "signers":[
@@ -38,7 +35,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"[h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]]",
-     "cbor":"8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"
+     "cbor_diag":"[h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]]",
+     "cbor":"8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"
    }
  }
diff --git a/spec-examples/Appendix_B_1_1.json b/spec-examples/Appendix_B_1_1.json
diff --git a/spec-examples/Appendix_B_1_2.json b/spec-examples/Appendix_B_1_2.json
diff --git a/spec-examples/Appendix_B_1_3.json b/spec-examples/Appendix_B_1_3.json
diff --git a/spec-examples/Appendix_B_1_4.json b/spec-examples/Appendix_B_1_4.json
diff --git a/spec-examples/Appendix_B_3_3.json b/spec-examples/Appendix_B_3_3.json

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,7 @@`
`25`	`25`	`}`
`26`	`26`	`]`
`27`	`27`	`},`
`28`		`- "rng_description":"seed for signature",`
`29`		`- "rng_stream":[`
`30`		`- "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"`
`31`		`- ]`
	`28`	`+ "rng_description":"seed for signature"`
`32`	`29`	`},`
`33`	`30`	`"intermediates":{`
`34`	`31`	`"signers":[`
`@@ -38,7 +35,7 @@`
`38`	`35`	`]`
`39`	`36`	`},`
`40`	`37`	`"output":{`
`41`		`- "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18']]])",`
`42`		`- "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E1130F733C8BD5FB95DFC12C3A1EB02D7B9D985CEDBA8ADBF969454B1EEFD3CD18"`
	`38`	`+ "cbor_diag":"991([h'A10300', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258']]])",`
	`39`	`+ "cbor":"D903DF8443A10300A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840D71C05DB52C9CE7F1BF5AAC01334BBEACAC1D86A2303E6EEAA89266F45C01ED602CA649EAF790D8BC99D2458457CA6A872061940E7AFBE48E289DFAC146AE258"`
`43`	`40`	`}`
`44`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`},`
`25`		`- "rng_description":"seed for signature",`
`26`		`- "rng_stream":[`
`27`		`- "6385EF5ECB18BE84EB57B41F367DA899A26EB19CADBD0EE729F6AE232B5D7B7C1C80506BA3BAB86ABD6A988D6460D53E"`
`28`		`- ]`
	`25`	`+ "rng_description":"seed for signature"`
`29`	`26`	`},`
`30`	`27`	`"intermediates":{`
`31`	`28`	`"signers":[`
`@@ -35,7 +32,7 @@`
`35`	`32`	`]`
`36`	`33`	`},`
`37`	`34`	`"output":{`
`38`		`- "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013822', {4: h'50333834'}, h'B8F85EFF78C88F5351CED2F1887B79B296490795594B62E41E22529BB90208B7D8CDDD4A46D0E9C986464D83D0A5D1ED8D8062F00BBCB95CF61ADE77E14A8012DC3CC6CFF122F05DA0D469989BE86655BBC66ED89F6EBEF69143DA0C404B1397']]])",`
`39`		`- "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013822A10444503338345860B8F85EFF78C88F5351CED2F1887B79B296490795594B62E41E22529BB90208B7D8CDDD4A46D0E9C986464D83D0A5D1ED8D8062F00BBCB95CF61ADE77E14A8012DC3CC6CFF122F05DA0D469989BE86655BBC66ED89F6EBEF69143DA0C404B1397"`
	`35`	`+ "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013822', {4: h'50333834'}, h'230DF24B9F31DD2D7D1B9C33CE59073FC21E02BB63DC55847626B5B7F43905D59ACC186890BC1FE8B6D12E61B0373FFBA131ECC6C21958CDFF28AD77E0C32F9A0C6CA247135F538496228B2BE5557E7DBD7280DB24B46B68C0772D1BAEF09DE5']]])",`
	`36`	`+ "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013822A10444503338345860230DF24B9F31DD2D7D1B9C33CE59073FC21E02BB63DC55847626B5B7F43905D59ACC186890BC1FE8B6D12E61B0373FFBA131ECC6C21958CDFF28AD77E0C32F9A0C6CA247135F538496228B2BE5557E7DBD7280DB24B46B68C0772D1BAEF09DE5"`
`40`	`37`	`}`
`41`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,7 @@`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`},`
`26`		`- "rng_description":"seed for signature",`
`27`		`- "rng_stream":[`
`28`		`- "1B467A82686FDA8AFB59D5915781DF34933A90267FA59381E554C9B7CB54D25139355BFC2674B7E24C376E81B58DFD685258EC1897D087D3A53E22A1E08BD6E72E05"`
`29`		`- ]`
	`26`	`+ "rng_description":"seed for signature"`
`30`	`27`	`},`
`31`	`28`	`"intermediates":{`
`32`	`29`	`"signers":[`
`@@ -36,7 +33,7 @@`
`36`	`33`	`]`
`37`	`34`	`},`
`38`	`35`	`"output":{`
`39`		`- "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65'}, h'000F348009BADC7DA478150AA7FA06DFD812CDF826344F17C7330563573D8F97F7A966924C3D88B108907235476E3F6BEA9F3890027792B0F94E905C217227CF064E01342ADF0C1B428CEEADB135D249526D972163B43847E2720A576D2CE82FBD4E1C450E289D5B2515B5B81427097F584D3C4679CC3C17012B9C3BE4D5FAB5626CAA12']]])",`
`40`		`- "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A104581E62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C655884000F348009BADC7DA478150AA7FA06DFD812CDF826344F17C7330563573D8F97F7A966924C3D88B108907235476E3F6BEA9F3890027792B0F94E905C217227CF064E01342ADF0C1B428CEEADB135D249526D972163B43847E2720A576D2CE82FBD4E1C450E289D5B2515B5B81427097F584D3C4679CC3C17012B9C3BE4D5FAB5626CAA12"`
	`36`	`+ "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013823', {4: h'62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65'}, h'00A2D28A7C2BDB1587877420F65ADF7D0B9A06635DD1DE64BB62974C863F0B160DD2163734034E6AC003B01E8705524C5C4CA479A952F0247EE8CB0B4FB7397BA08D009E0C8BF482270CC5771AA143966E5A469A09F613488030C5B07EC6D722E3835ADB5B2D8C44E95FFB13877DD2582866883535DE3BB03D01753F83AB87BB4F7A0297']]])",`
	`37`	`+ "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818344A1013823A104581E62696C626F2E62616767696E7340686F626269746F6E2E6578616D706C65588400A2D28A7C2BDB1587877420F65ADF7D0B9A06635DD1DE64BB62974C863F0B160DD2163734034E6AC003B01E8705524C5C4CA479A952F0247EE8CB0B4FB7397BA08D009E0C8BF482270CC5771AA143966E5A469A09F613488030C5B07EC6D722E3835ADB5B2D8C44E95FFB13877DD2582866883535DE3BB03D01753F83AB87BB4F7A0297"`
`41`	`38`	`}`
`42`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,7 @@`
`26`	`26`	`}`
`27`	`27`	`]`
`28`	`28`	`},`
`29`		`- "rng_description":"seed for signature",`
`30`		`- "rng_stream":[`
`31`		`- "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"`
`32`		`- ]`
	`29`	`+ "rng_description":"seed for signature"`
`33`	`30`	`},`
`34`	`31`	`"intermediates":{`
`35`	`32`	`"signers":[`
`@@ -39,7 +36,7 @@`
`39`	`36`	`]`
`40`	`37`	`},`
`41`	`38`	`"output":{`
`42`		`- "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE1']]])",`
`43`		`- "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE1"`
	`39`	`+ "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A10126', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30B']]])",`
	`40`	`+ "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818343A10126A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30B"`
`44`	`41`	`}`
`45`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,7 @@`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`},`
`31`		`- "rng_description":"seed for signature",`
`32`		`- "rng_stream":[`
`33`		`- "20DB1328B01EBB78122CE86D5B1A3A097EC44EAC603FD5F60108EDF98EA81393"`
`34`		`- ]`
	`31`	`+ "rng_description":"seed for signature"`
`35`	`32`	`},`
`36`	`33`	`"intermediates":{`
`37`	`34`	`"signers":[`
`@@ -41,7 +38,7 @@`
`41`	`38`	`]`
`42`	`39`	`},`
`43`	`40`	`"output":{`
`44`		`- "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013903E6', {4: h'3131'}, h'EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0']]])",`
`45`		`- "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818345A1013903E6A1044231315840EAE868ECC176883766C5DC5BA5B8DCA25DAB3C2E56A551CE5705B793914348E14EEA4AEE6E0C9F09DB4EF3DDECA8F3506CD1A98A8FB64327BE470355C9657CE0"`
	`41`	`+ "cbor_diag":"991([h'', {}, h'546869732069732074686520636F6E74656E742E', [[h'A1013903E6', {4: h'3131'}, h'E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A']]])",`
	`42`	`+ "cbor":"D903DF8440A054546869732069732074686520636F6E74656E742E818345A1013903E6A1044231315840E2AEAFD40D69D19DFE6E52077C5D7FF4E408282CBEFB5D06CBF414AF2E19D982AC45AC98B8544C908B4507DE1E90B717C3D34816FE926A2B98F53AFD2FA0F30A"`
`46`	`43`	`}`
`47`	`44`	`}`