Skip to content

Commit bed9535

Browse files
armfazharmfazh
committed
Fixes L parameter for P521 suites.
1 parent 7639120 commit bed9535

File tree

5 files changed

+116
-120
lines changed

5 files changed

+116
-120
lines changed

‎suites.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func init() {
100100
P384_XMDSHA512_SSWU_RO_.register(&params{E: C.P384, K: 192, Exp: sha512, Map: M.MapDescriptor{ID: M.SSWU, Sgn0: GF.SignLE, Z: -12}, L: 72, RO: true})
101101
P384_XMDSHA512_SVDW_NU_.register(&params{E: C.P384, K: 192, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: -1}, L: 72, RO: false})
102102
P384_XMDSHA512_SVDW_RO_.register(&params{E: C.P384, K: 192, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: -1}, L: 72, RO: true})
103-
P521_XMDSHA512_SSWU_NU_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SSWU, Sgn0: GF.SignLE, Z: -4}, L: 96, RO: false})
104-
P521_XMDSHA512_SSWU_RO_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SSWU, Sgn0: GF.SignLE, Z: -4}, L: 96, RO: true})
105-
P521_XMDSHA512_SVDW_NU_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: 1}, L: 96, RO: false})
106-
P521_XMDSHA512_SVDW_RO_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: 1}, L: 96, RO: true})
103+
P521_XMDSHA512_SSWU_NU_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SSWU, Sgn0: GF.SignLE, Z: -4}, L: 98, RO: false})
104+
P521_XMDSHA512_SSWU_RO_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SSWU, Sgn0: GF.SignLE, Z: -4}, L: 98, RO: true})
105+
P521_XMDSHA512_SVDW_NU_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: 1}, L: 98, RO: false})
106+
P521_XMDSHA512_SVDW_RO_.register(&params{E: C.P521, K: 256, Exp: sha512, Map: M.MapDescriptor{ID: M.SVDW, Sgn0: GF.SignLE, Z: 1}, L: 98, RO: true})
107107
Curve25519_XMDSHA256_ELL2_NU_.register(&params{E: C.Curve25519, K: 128, Exp: sha256, Map: M.MapDescriptor{ID: M.ELL2, Sgn0: GF.SignLE, Z: 2}, L: 48, RO: false})
108108
Curve25519_XMDSHA256_ELL2_RO_.register(&params{E: C.Curve25519, K: 128, Exp: sha256, Map: M.MapDescriptor{ID: M.ELL2, Sgn0: GF.SignLE, Z: 2}, L: 48, RO: true})
109109
Curve25519_XMDSHA512_ELL2_NU_.register(&params{E: C.Curve25519, K: 128, Exp: sha512, Map: M.MapDescriptor{ID: M.ELL2, Sgn0: GF.SignLE, Z: 2}, L: 48, RO: false})

‎testdata/P521_XMD-SHA-512_SSWU_NU_.json‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"L": "0x60",
2+
"L": "0x62",
33
"Z": "0x1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb",
44
"ciphersuite": "P521_XMD:SHA-512_SSWU_NU_",
55
"curve": "P521",
@@ -12,65 +12,64 @@
1212
"hash": "sha512",
1313
"k": "0x100",
1414
"map": {
15-
"name": "SSWU",
16-
"sgn0": "sgn0_le"
15+
"name": "SSWU"
1716
},
1817
"randomOracle": false,
1918
"vectors": [
2019
{
2120
"P": {
22-
"x": "0x0074dff9ec0371e4de820fc4b2a8a5e71498434a458a4805ba11d62ac80da2049fbccc3e4bf20a45efcd04344528fc1cbbfdbed6b2e05c5cc3d4fe55e00fb2647dcd",
23-
"y": "0x001cbb63a0161e5eee698ae8044949c00c0164fc247f3f2a4ecf2c6c0a03d5a64593b563623c1a8aee92ec23dfe2430fa5a912a825ca638f4b13963cd14729424b57"
21+
"x": "0x019a3f7c090d30f6d743e9e36cff15d19d783409e6f0c3319cd88a82a0d85082121aaa0c64019b62b0ba3dc7a2d8b9d4fe6c4efdd04c5496a5741cbb264d82fdc117",
22+
"y": "0x014b3da70eced4d7a0d8c4d218707d5cf4ed280fd6faea35f4152776ce84e74b7e06a9278e8b4c900ef01739c496c6d406c2c94c93289f64e852617e75f4705c77eb"
2423
},
2524
"Q": {
26-
"x": "0x0074dff9ec0371e4de820fc4b2a8a5e71498434a458a4805ba11d62ac80da2049fbccc3e4bf20a45efcd04344528fc1cbbfdbed6b2e05c5cc3d4fe55e00fb2647dcd",
27-
"y": "0x001cbb63a0161e5eee698ae8044949c00c0164fc247f3f2a4ecf2c6c0a03d5a64593b563623c1a8aee92ec23dfe2430fa5a912a825ca638f4b13963cd14729424b57"
25+
"x": "0x019a3f7c090d30f6d743e9e36cff15d19d783409e6f0c3319cd88a82a0d85082121aaa0c64019b62b0ba3dc7a2d8b9d4fe6c4efdd04c5496a5741cbb264d82fdc117",
26+
"y": "0x014b3da70eced4d7a0d8c4d218707d5cf4ed280fd6faea35f4152776ce84e74b7e06a9278e8b4c900ef01739c496c6d406c2c94c93289f64e852617e75f4705c77eb"
2827
},
2928
"msg": "",
3029
"u": [
31-
"0x0193d358a22125c3d2b7515b0e9ca279d1089ee0a4c806e5d585ed585beef9eaae37e0bf2c632c60e94fcb76db30418e7afd9c713bf7d47ec8ca6b851a5d8b69a98b"
30+
"0x012673fbefcad8efbf97bad0ffe0b0ad2886192767766494ec5a51af9512add3ace53a3f9daca250ca31ce7d1a6a706672fcae3807ca3f38561fc05279b090c55fa5"
3231
]
3332
},
3433
{
3534
"P": {
36-
"x": "0x01a5084b5e79f60471b4cf3524bcf441a5be3d6ef10be5dd534ed7ddf9c093f6bb79f53792b7a2e38c3610245c69b49511cc4b882551048a5c2ada5dbf81be0ae471",
37-
"y": "0x0162d8cc7e11ba34475e40e8bb6bea8034840dc82f72338e9873fc8105921dbf980743927ab8476610c9983b158a63d82d5c18d71df598b325221bfaaa82b62d9c10"
35+
"x": "0x012a1913caab60f45ce56de002353faa3447462f4de4056b70a599f96af93b5d6f1b5203d2f8cf05332ff8555ceb3e3e0f06adfff58ba6c82017496e2ec8f822b99c",
36+
"y": "0x00f654a9f15e17be038594d2fd3586d2e8f993b1b4428e3fb22650350ff14ede79aec748720a7bb56e46f997ae69c61c693fdba6cdda065e52585cf66cc6194792fc"
3837
},
3938
"Q": {
40-
"x": "0x01a5084b5e79f60471b4cf3524bcf441a5be3d6ef10be5dd534ed7ddf9c093f6bb79f53792b7a2e38c3610245c69b49511cc4b882551048a5c2ada5dbf81be0ae471",
41-
"y": "0x0162d8cc7e11ba34475e40e8bb6bea8034840dc82f72338e9873fc8105921dbf980743927ab8476610c9983b158a63d82d5c18d71df598b325221bfaaa82b62d9c10"
39+
"x": "0x012a1913caab60f45ce56de002353faa3447462f4de4056b70a599f96af93b5d6f1b5203d2f8cf05332ff8555ceb3e3e0f06adfff58ba6c82017496e2ec8f822b99c",
40+
"y": "0x00f654a9f15e17be038594d2fd3586d2e8f993b1b4428e3fb22650350ff14ede79aec748720a7bb56e46f997ae69c61c693fdba6cdda065e52585cf66cc6194792fc"
4241
},
4342
"msg": "abc",
4443
"u": [
45-
"0x00e349a6622102a38650a7405fc2bdf1245b8ea21e03e76060c23cfb2f6067522026aba99a4bcc8e8f739d1852fdaf5e51a8114aa033ee9d10832ce1084ad102dca0"
44+
"0x018cb669b0ea0a74c5b46d2f9321d233e52a9677eace4035cfad1f3cbc3ec9cb91e11a426c8496d1e734475965028452fb2f25b6752186c3808fbad1d44369cf38c6"
4645
]
4746
},
4847
{
4948
"P": {
50-
"x": "0x00e823a635ca827853994d748f78f407cb99ecc16166da410c30f5b728ba5d9da6c1664a7a123d18c538b733e54e4bb0e9bfe743ec6260debf547cd61af94d8af6dc",
51-
"y": "0x0170c8f2d8e642e1651ca96c10b523f65e3f982945b6698effc78d15e148d0455ed2370a3fa898613c9407e454db1c9ff39165e44a02cd2397a95c5f3f102599fe7b"
49+
"x": "0x017cdbdec13b7fbed57dfbf144ed0b468457c95c9b27684fa29b2af43e4a06896f32773cea6ac3d9f8d512699e4f125d09610a897d0d5d59205619d07c8428b79423",
50+
"y": "0x015b9d940c82ce9e8fdc9cd8bafed1dcc159d4d3cc3ae07797babd2046d39c010d056ff76266938d63621e38ed6d05a68c04f783b7ac0ea9b904ba1689daa0b4e152"
5251
},
5352
"Q": {
54-
"x": "0x00e823a635ca827853994d748f78f407cb99ecc16166da410c30f5b728ba5d9da6c1664a7a123d18c538b733e54e4bb0e9bfe743ec6260debf547cd61af94d8af6dc",
55-
"y": "0x0170c8f2d8e642e1651ca96c10b523f65e3f982945b6698effc78d15e148d0455ed2370a3fa898613c9407e454db1c9ff39165e44a02cd2397a95c5f3f102599fe7b"
53+
"x": "0x017cdbdec13b7fbed57dfbf144ed0b468457c95c9b27684fa29b2af43e4a06896f32773cea6ac3d9f8d512699e4f125d09610a897d0d5d59205619d07c8428b79423",
54+
"y": "0x015b9d940c82ce9e8fdc9cd8bafed1dcc159d4d3cc3ae07797babd2046d39c010d056ff76266938d63621e38ed6d05a68c04f783b7ac0ea9b904ba1689daa0b4e152"
5655
},
5756
"msg": "abcdef0123456789",
5857
"u": [
59-
"0x01f402cd45679ffd7adcb768498a1169fc2906701cf7a2fb2bafb67a6a2bcaf426159995c1c5cf135c92e49ccf94e9534c5b966ea51aad9a6a9747b44dbec6e3ae99"
58+
"0x019be697df5c87d3c2904d6ff5509809e8cda7937bff5c49f96a7db2a04808a1d3b92a39c35b547f31d087fb8485eeb23649e8359b4f997d60bb3803cf5413d1a36a"
6059
]
6160
},
6261
{
6362
"P": {
64-
"x": "0x015ec57e0b995da9568e8d2b1b3856399f24ff650f4daaac8620da5613fc8aaf011691744db8ce27498b6d9d313952ca00dc05564da784712fb4bc289a934940e16e",
65-
"y": "0x00b422a44a249e3c4d2b534bce9d2aba782f7d81679b786ab4f5c97a34702a354851d7cc5f21397be3a4f9a83dcabf1a3241255c45840b068567e2c843607ffe0937"
63+
"x": "0x018787d70cc75cb6ea20b5b3375a7ef0da589e87d3479b86b0c0eddfb97f89fdd6b365f913354e2866fd93d713c65596c09f9098cf4d0a4446c1b44f3c81282cd436",
64+
"y": "0x00c6a63d8a7060cc3e4b040236ae6638a20f4e9872bdc2165ceb862578c04ca1443fb853452e485f07e759bde38b0674ea63424c55063729d9d43661f679be6833b3"
6665
},
6766
"Q": {
68-
"x": "0x015ec57e0b995da9568e8d2b1b3856399f24ff650f4daaac8620da5613fc8aaf011691744db8ce27498b6d9d313952ca00dc05564da784712fb4bc289a934940e16e",
69-
"y": "0x00b422a44a249e3c4d2b534bce9d2aba782f7d81679b786ab4f5c97a34702a354851d7cc5f21397be3a4f9a83dcabf1a3241255c45840b068567e2c843607ffe0937"
67+
"x": "0x018787d70cc75cb6ea20b5b3375a7ef0da589e87d3479b86b0c0eddfb97f89fdd6b365f913354e2866fd93d713c65596c09f9098cf4d0a4446c1b44f3c81282cd436",
68+
"y": "0x00c6a63d8a7060cc3e4b040236ae6638a20f4e9872bdc2165ceb862578c04ca1443fb853452e485f07e759bde38b0674ea63424c55063729d9d43661f679be6833b3"
7069
},
7170
"msg": "a512_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
7271
"u": [
73-
"0x00deed8428df4b4e18889cf80998fa56f34c53a99171a7ffc6cc22693f89c13a13713e4a0258839ba192c1fb1cebc97ac66e8eaa30b8f5e747122aa35df669b240cd"
72+
"0x0114e2e15cb9ae98231a755c63161ab128e4ee361f8a8b009b860abda46ef057674ff90f2f3179118361814acbcde818363c37a53d2a0e2005becb6e81c103d6f0f1"
7473
]
7574
}
7675
]

0 commit comments

Comments
 (0)