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

jimsch · web-flow · commit ad38c703b856 · 2016-06-25T11:58:09.000-07:00
Missed the tags in the examples
diff --git a/chacha-poly-examples/chacha-poly-01.json b/chacha-poly-examples/chacha-poly-01.json
@@ -35,7 +35,7 @@
      ]
    },
    "output":{
-     "cbor_diag":"992([h'A1011818', {5: h'26682306D4FB28CA01B43B80'}, h'5F2BD5381BBB04921A8477E55C0D850069674A0500000000000000000000000000000000', [[h'', {1: -6, 4: h'7365632D323536'}, h'']]])",
-     "cbor":"D903E08444A1011818A1054C26682306D4FB28CA01B43B8058245F2BD5381BBB04921A8477E55C0D850069674A0500000000000000000000000000000000818340A2012504477365632D32353640"
+     "cbor_diag":"992([h'A1011818', {5: h'26682306D4FB28CA01B43B80'}, h'5F2BD5381BBB04921A8477E55C0D850069674A05E683D416583AA0CEE0E2929CDF648094', [[h'', {1: -6, 4: h'7365632D323536'}, h'']]])",
+     "cbor":"D903E08444A1011818A1054C26682306D4FB28CA01B43B8058245F2BD5381BBB04921A8477E55C0D850069674A05E683D416583AA0CEE0E2929CDF648094818340A2012504477365632D32353640"
    }
  }
diff --git a/chacha-poly-examples/chacha-poly-enc-01.json b/chacha-poly-examples/chacha-poly-enc-01.json
@@ -30,7 +30,7 @@
      "CEK_hex":"0F1E2D3C4B5A69788796A5B4C3D2E1F01F2E3D4C5B6A798897A6B5C4D3E2F100"
    },
    "output":{
-     "cbor_diag":"993([h'A1011818', {5: h'5C3A9950BD2852F66E6C8D4F'}, h'3E536D4992A21591575C55FA22981B31AE1C045900000000000000000000000000000000'])",
-     "cbor":"D903E18344A1011818A1054C5C3A9950BD2852F66E6C8D4F58243E536D4992A21591575C55FA22981B31AE1C045900000000000000000000000000000000"
+     "cbor_diag":"993([h'A1011818', {5: h'5C3A9950BD2852F66E6C8D4F'}, h'3E536D4992A21591575C55FA22981B31AE1C045946D0E41A8A1ABD12BC9525922F4EB618'])",
+     "cbor":"D903E18344A1011818A1054C5C3A9950BD2852F66E6C8D4F58243E536D4992A21591575C55FA22981B31AE1C045946D0E41A8A1ABD12BC9525922F4EB618"
    }
  }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`]`
`36`	`36`	`},`
`37`	`37`	`"output":{`
`38`		`- "cbor_diag":"992([h'A1011818', {5: h'26682306D4FB28CA01B43B80'}, h'5F2BD5381BBB04921A8477E55C0D850069674A0500000000000000000000000000000000', [[h'', {1: -6, 4: h'7365632D323536'}, h'']]])",`
`39`		`- "cbor":"D903E08444A1011818A1054C26682306D4FB28CA01B43B8058245F2BD5381BBB04921A8477E55C0D850069674A0500000000000000000000000000000000818340A2012504477365632D32353640"`
	`38`	`+ "cbor_diag":"992([h'A1011818', {5: h'26682306D4FB28CA01B43B80'}, h'5F2BD5381BBB04921A8477E55C0D850069674A05E683D416583AA0CEE0E2929CDF648094', [[h'', {1: -6, 4: h'7365632D323536'}, h'']]])",`
	`39`	`+ "cbor":"D903E08444A1011818A1054C26682306D4FB28CA01B43B8058245F2BD5381BBB04921A8477E55C0D850069674A05E683D416583AA0CEE0E2929CDF648094818340A2012504477365632D32353640"`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"CEK_hex":"0F1E2D3C4B5A69788796A5B4C3D2E1F01F2E3D4C5B6A798897A6B5C4D3E2F100"`
`31`	`31`	`},`
`32`	`32`	`"output":{`
`33`		`- "cbor_diag":"993([h'A1011818', {5: h'5C3A9950BD2852F66E6C8D4F'}, h'3E536D4992A21591575C55FA22981B31AE1C045900000000000000000000000000000000'])",`
`34`		`- "cbor":"D903E18344A1011818A1054C5C3A9950BD2852F66E6C8D4F58243E536D4992A21591575C55FA22981B31AE1C045900000000000000000000000000000000"`
	`33`	`+ "cbor_diag":"993([h'A1011818', {5: h'5C3A9950BD2852F66E6C8D4F'}, h'3E536D4992A21591575C55FA22981B31AE1C045946D0E41A8A1ABD12BC9525922F4EB618'])",`
	`34`	`+ "cbor":"D903E18344A1011818A1054C5C3A9950BD2852F66E6C8D4F58243E536D4992A21591575C55FA22981B31AE1C045946D0E41A8A1ABD12BC9525922F4EB618"`
`35`	`35`	`}`
`36`	`36`	`}`