diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2024-05-24 13:27:13 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2024-05-24 13:27:13 +0700 |
| commit | c1f58f8a44dd67edf45954d76aa59e3f26e31f99 (patch) | |
| tree | 59f365c914caa8bab40d8b0d942d91a27238967d | |
| parent | Embed Sike data in source to make it trim-friendly (diff) | |
| download | BouncyCastle.NET-ed25519-c1f58f8a44dd67edf45954d76aa59e3f26e31f99.tar.xz | |
Sike followup changes
| -rw-r--r-- | crypto/Contributors.html | 2 | ||||
| -rw-r--r-- | crypto/Readme.html | 1 | ||||
| -rw-r--r-- | crypto/src/pqc/crypto/sike/Internal.cs | 8 | ||||
| -rw-r--r-- | crypto/src/pqc/crypto/sike/P434.cs | 4 | ||||
| -rw-r--r-- | crypto/src/pqc/crypto/sike/P503.cs | 4 | ||||
| -rw-r--r-- | crypto/src/pqc/crypto/sike/P610.cs | 4 | ||||
| -rw-r--r-- | crypto/src/pqc/crypto/sike/P751.cs | 4 |
7 files changed, 10 insertions, 17 deletions
diff --git a/crypto/Contributors.html b/crypto/Contributors.html index 6fb80482a..2abd54863 100644 --- a/crypto/Contributors.html +++ b/crypto/Contributors.html @@ -293,7 +293,7 @@ University of Wollongong, Institute of Cybersecurity and Cryptology, under the s <p>Triton (https://github.com/EnigmaTriton) - Improvements in PbeUtilities.</p> </li> <li> - <p>Rob Hague (https://github.com/Rob-Hague) - Embed picnic data in source to make it trim-friendly.</p> + <p>Rob Hague (https://github.com/Rob-Hague) - Embed Picnic and Sike data in source to make it trim-friendly.</p> </li> </ul> </body> diff --git a/crypto/Readme.html b/crypto/Readme.html index bf21ec9e3..3c5a451b4 100644 --- a/crypto/Readme.html +++ b/crypto/Readme.html @@ -341,6 +341,7 @@ </ul> <h5>Additional Features and Functionality</h5> <ul> + <li>Embed Picnic and Sike data in source to make it trim-friendly.</li> </ul> <h5>Additional Notes</h5> <ul> diff --git a/crypto/src/pqc/crypto/sike/Internal.cs b/crypto/src/pqc/crypto/sike/Internal.cs index b771c5c46..d86986e26 100644 --- a/crypto/src/pqc/crypto/sike/Internal.cs +++ b/crypto/src/pqc/crypto/sike/Internal.cs @@ -132,14 +132,6 @@ namespace Org.BouncyCastle.Pqc.Crypto.Sike protected internal ulong[] ph3_T1; protected internal ulong[] ph3_T2; - - internal static uint[] ReadIntsFromProperty(uint[] data, uint intSize) - { - uint[] ints = new uint[intSize]; - Array.Copy(data, ints, data.Length); - return ints; - } - internal static ulong[] ReadFromProperty(ulong[] data, uint ulongSize) { ulong[] ulongs = new ulong[ulongSize]; diff --git a/crypto/src/pqc/crypto/sike/P434.cs b/crypto/src/pqc/crypto/sike/P434.cs index 4e4382b44..05dd9604a 100644 --- a/crypto/src/pqc/crypto/sike/P434.cs +++ b/crypto/src/pqc/crypto/sike/P434.cs @@ -106,8 +106,8 @@ internal class P434 this.PLEN_2 = 55; this.PLEN_3 = 47; - ph2_path = ReadIntsFromProperty(s_ph2_path, PLEN_2); - ph3_path = ReadIntsFromProperty(s_ph3_path, PLEN_3); + ph2_path = s_ph2_path; + ph3_path = s_ph3_path; A_gen = ReadFromProperty(s_A_gen, 6 * NWORDS64_FIELD); B_gen = ReadFromProperty(s_B_gen, 6 * NWORDS64_FIELD); XQB3 = ReadFromProperty(s_XQB3, 2 * NWORDS64_FIELD); diff --git a/crypto/src/pqc/crypto/sike/P503.cs b/crypto/src/pqc/crypto/sike/P503.cs index d8f45ae2c..a01807ad4 100644 --- a/crypto/src/pqc/crypto/sike/P503.cs +++ b/crypto/src/pqc/crypto/sike/P503.cs @@ -142,8 +142,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Sike this.PLEN_2 = 51; this.PLEN_3 = 54; - ph2_path = ReadIntsFromProperty(s_ph2_path, PLEN_2); - ph3_path = ReadIntsFromProperty(s_ph3_path, PLEN_3); + ph2_path = s_ph2_path; + ph3_path = s_ph3_path; A_gen = ReadFromProperty(s_A_gen, 6 * NWORDS64_FIELD); B_gen = ReadFromProperty(s_B_gen, 6 * NWORDS64_FIELD); XQB3 = ReadFromProperty(s_XQB3, 2 * NWORDS64_FIELD); diff --git a/crypto/src/pqc/crypto/sike/P610.cs b/crypto/src/pqc/crypto/sike/P610.cs index 056dc339e..12134f4ba 100644 --- a/crypto/src/pqc/crypto/sike/P610.cs +++ b/crypto/src/pqc/crypto/sike/P610.cs @@ -142,8 +142,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Sike this.PLEN_2 = 62; this.PLEN_3 = 65; - ph2_path = ReadIntsFromProperty(s_ph2_path, PLEN_2); - ph3_path = ReadIntsFromProperty(s_ph3_path, PLEN_3); + ph2_path = s_ph2_path; + ph3_path = s_ph3_path; A_gen = ReadFromProperty(s_A_gen, 6 * NWORDS64_FIELD); B_gen = ReadFromProperty(s_B_gen, 6 * NWORDS64_FIELD); XQB3 = ReadFromProperty(s_XQB3, 2 * NWORDS64_FIELD); diff --git a/crypto/src/pqc/crypto/sike/P751.cs b/crypto/src/pqc/crypto/sike/P751.cs index 5a181ddf1..188c578ab 100644 --- a/crypto/src/pqc/crypto/sike/P751.cs +++ b/crypto/src/pqc/crypto/sike/P751.cs @@ -155,8 +155,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Sike PLEN_2 = 94; PLEN_3 = 81; - ph2_path = ReadIntsFromProperty(s_ph2_path, PLEN_2); - ph3_path = ReadIntsFromProperty(s_ph3_path, PLEN_3); + ph2_path = s_ph2_path; + ph3_path = s_ph3_path; A_gen = ReadFromProperty(s_A_gen, 6 * NWORDS64_FIELD); B_gen = ReadFromProperty(s_B_gen, 6 * NWORDS64_FIELD); XQB3 = ReadFromProperty(s_XQB3, 2 * NWORDS64_FIELD); |