From 74b1a034c3af8034fa7907834e18fe3aa58b5744 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Sun, 26 Jun 2022 20:33:19 +0700 Subject: Cleanup in PQC code --- crypto/src/pqc/crypto/IMessageSigner.cs | 2 +- crypto/src/pqc/crypto/cmce/CmceEngine.cs | 2697 ++++++++++---------- crypto/src/pqc/crypto/cmce/CmceKemExtractor.cs | 65 +- crypto/src/pqc/crypto/cmce/CmceKemGenerator.cs | 121 +- .../pqc/crypto/cmce/CmceKeyGenerationParameters.cs | 4 +- crypto/src/pqc/crypto/cmce/CmceKeyPairGenerator.cs | 7 +- crypto/src/pqc/crypto/cmce/CmceKeyParameters.cs | 5 +- .../pqc/crypto/cmce/CmcePrivateKeyParameters.cs | 1 + .../src/pqc/crypto/cmce/CmcePublicKeyParameters.cs | 4 +- crypto/src/pqc/crypto/cmce/GF.cs | 9 +- crypto/src/pqc/crypto/frodo/FrodoEngine.cs | 2 +- .../pqc/crypto/frodo/FrodoPublicKeyParameters.cs | 11 +- crypto/src/pqc/crypto/lms/HSS.cs | 2 +- crypto/src/pqc/crypto/lms/HSSSigner.cs | 3 +- crypto/src/pqc/crypto/lms/LMSSigner.cs | 2 +- crypto/src/pqc/crypto/picnic/PicnicEngine.cs | 6 +- crypto/src/pqc/crypto/picnic/PicnicSigner.cs | 3 +- .../pqc/crypto/sphincsplus/SPHINCSPlusSigner.cs | 2 +- 18 files changed, 1477 insertions(+), 1469 deletions(-) diff --git a/crypto/src/pqc/crypto/IMessageSigner.cs b/crypto/src/pqc/crypto/IMessageSigner.cs index 9a8a30b0a..f04ca4477 100644 --- a/crypto/src/pqc/crypto/IMessageSigner.cs +++ b/crypto/src/pqc/crypto/IMessageSigner.cs @@ -1,6 +1,6 @@ using Org.BouncyCastle.Crypto; -namespace Org.BouncyCastle.pqc.crypto +namespace Org.BouncyCastle.Pqc.Crypto { /** * Base interface for a PQC signing algorithm. diff --git a/crypto/src/pqc/crypto/cmce/CmceEngine.cs b/crypto/src/pqc/crypto/cmce/CmceEngine.cs index 9b94b1613..41194e8a6 100644 --- a/crypto/src/pqc/crypto/cmce/CmceEngine.cs +++ b/crypto/src/pqc/crypto/cmce/CmceEngine.cs @@ -1,1826 +1,1821 @@ - using System; -using System.ComponentModel; -using Org.BouncyCastle.Asn1; + using Org.BouncyCastle.Asn1.Nist; using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Crypto.Digests; -using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; namespace Org.BouncyCastle.Pqc.Crypto.Cmce { - -} -class CmceEngine -{ - private int SYS_N; // = 3488; - private int SYS_T; // = 64; - private int GFBITS; // = 12; - - private int IRR_BYTES; // = SYS_T * 2; - private int COND_BYTES; // = (1 << (GFBITS-4))*(2*GFBITS - 1); - - - private int PK_NROWS; // = SYS_T*GFBITS; - private int PK_NCOLS; // = SYS_N - PK_NROWS; - private int PK_ROW_BYTES;// = (PK_NCOLS + 7)/8; - - private int SYND_BYTES;// = (PK_NROWS + 7)/8; - - private int GFMASK; // = (1 << GFBITS) - 1; + internal class CmceEngine + { + private int SYS_N; // = 3488; + private int SYS_T; // = 64; + private int GFBITS; // = 12; - private int[] poly; // only needed for key pair gen - private int defaultKeySize; + private int IRR_BYTES; // = SYS_T * 2; + private int COND_BYTES; // = (1 << (GFBITS-4))*(2*GFBITS - 1); - private GF gf; - private Benes benes; - private bool usePadding; - private bool countErrorIndices; - private bool usePivots; // used for compression + private int PK_NROWS; // = SYS_T*GFBITS; + private int PK_NCOLS; // = SYS_N - PK_NROWS; + private int PK_ROW_BYTES;// = (PK_NCOLS + 7)/8; - - public int IrrBytes => IRR_BYTES; + private int SYND_BYTES;// = (PK_NROWS + 7)/8; - public int CondBytes => COND_BYTES; - public int PrivateKeySize => COND_BYTES + IRR_BYTES + SYS_N / 8 + 40; + private int GFMASK; // = (1 << GFBITS) - 1; - public int PublicKeySize => usePadding ? PK_NROWS * ((SYS_N / 8 - ((PK_NROWS - 1) / 8))) : PK_NROWS * PK_NCOLS / 8; - - public int CipherTextSize => SYND_BYTES + 32; + private int[] poly; // only needed for key pair gen + private int defaultKeySize; - - public int DefaultSessionKeySize => defaultKeySize; - - public CmceEngine(int m, int n, int t, int[] p, bool usePivots, int defaultKeySize) - { - this.usePivots = usePivots; - this.SYS_N = n; - this.SYS_T = t; - this.GFBITS = m; - this.poly = p; - this.defaultKeySize = defaultKeySize; + private GF gf; + private Benes benes; - IRR_BYTES = SYS_T * 2; // t * ceil(m/8) - COND_BYTES = (1 << (GFBITS - 4)) * (2 * GFBITS - 1); + private bool usePadding; + private bool countErrorIndices; + private bool usePivots; // used for compression - PK_NROWS = SYS_T * GFBITS; - PK_NCOLS = SYS_N - PK_NROWS; - PK_ROW_BYTES = (PK_NCOLS + 7) / 8; - SYND_BYTES = (PK_NROWS + 7) / 8; - GFMASK = (1 << GFBITS) - 1; + public int IrrBytes => IRR_BYTES; + public int CondBytes => COND_BYTES; + public int PrivateKeySize => COND_BYTES + IRR_BYTES + SYS_N / 8 + 40; - if (GFBITS == 12) - { - gf = new GF12(GFBITS); - benes = new Benes12(SYS_N, SYS_T, GFBITS); - } - else - { - gf = new GF13(GFBITS); - benes = new Benes13(SYS_N, SYS_T, GFBITS); + public int PublicKeySize => usePadding ? PK_NROWS * ((SYS_N / 8 - ((PK_NROWS - 1) / 8))) : PK_NROWS * PK_NCOLS / 8; - } - usePadding = SYS_T % 8 != 0; - countErrorIndices = (1 << GFBITS) > SYS_N; - } - public byte[] GeneratePublicKeyFromPrivateKey(byte[] sk) - { - byte[] pk = new byte[PublicKeySize]; - ushort[] pi = new ushort[1 << GFBITS]; - ulong[] pivots = {0}; + public int CipherTextSize => SYND_BYTES + 32; - // generating the perm used to generate the private key - uint[] perm = new uint[1 << GFBITS]; - byte[] hash = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4)]; - int hash_idx = hash.Length - 32 - IRR_BYTES - ((1 << GFBITS) * 4); - IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - digest.Update(64); - digest.BlockUpdate(sk, 0, 32); - ((IXof)digest).DoFinal(hash, 0, hash.Length); + public int DefaultSessionKeySize => defaultKeySize; - for (int i = 0; i < (1 << GFBITS); i++) + public CmceEngine(int m, int n, int t, int[] p, bool usePivots, int defaultKeySize) { - perm[i] = Utils.Load4(hash, hash_idx + i * 4); - } - PKGen(pk, sk, perm, pi, pivots); - return pk; - } - - // generates the rest of the private key given the first 40 bytes - public byte[] decompress_private_key(byte[] sk) - { - byte[] reg_sk = new byte[PrivateKeySize]; - Array.Copy(sk, 0, reg_sk, 0, sk.Length); - - // s: n/8 (random string) - // a: COND_BYTES (field ordering) ((2m-1) * 2^(m-4)) - // g: IRR_BYTES (polynomial) (t * 2) + this.usePivots = usePivots; + this.SYS_N = n; + this.SYS_T = t; + this.GFBITS = m; + this.poly = p; + this.defaultKeySize = defaultKeySize; - // generate hash using the seed given in the sk (64 || first 32 bytes) - byte[] hash = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4) + IRR_BYTES + 32]; + IRR_BYTES = SYS_T * 2; // t * ceil(m/8) + COND_BYTES = (1 << (GFBITS - 4)) * (2 * GFBITS - 1); - int hash_idx = 0; - IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - digest.Update((byte)64); - digest.BlockUpdate(sk, 0, 32); // input - ((IXof)digest).DoFinal(hash, 0, hash.Length); + PK_NROWS = SYS_T * GFBITS; + PK_NCOLS = SYS_N - PK_NROWS; + PK_ROW_BYTES = (PK_NCOLS + 7) / 8; + SYND_BYTES = (PK_NROWS + 7) / 8; + GFMASK = (1 << GFBITS) - 1; - // generate g - if (sk.Length <= 40) - { - ushort[] field = new ushort[SYS_T]; - byte[] reg_g = new byte[IRR_BYTES]; - hash_idx = hash.Length - 32 - IRR_BYTES; - for (int i = 0; i < SYS_T; i++) + if (GFBITS == 12) { - field[i] = Utils.LoadGF(hash, hash_idx + i * 2, GFMASK); + gf = new GF12(GFBITS); + benes = new Benes12(SYS_N, SYS_T, GFBITS); } - GenerateIrrPoly(field); - - for (int i = 0; i < SYS_T; i++) + else { - Utils.StoreGF(reg_g, i * 2, field[i]); + gf = new GF13(GFBITS); + benes = new Benes13(SYS_N, SYS_T, GFBITS); + } - Array.Copy(reg_g, 0, reg_sk, 40, IRR_BYTES); + usePadding = SYS_T % 8 != 0; + countErrorIndices = (1 << GFBITS) > SYS_N; } - - // generate a - if (sk.Length <= 40 + IRR_BYTES) + public byte[] GeneratePublicKeyFromPrivateKey(byte[] sk) { - uint[] perm = new uint[1 << GFBITS]; + byte[] pk = new byte[PublicKeySize]; ushort[] pi = new ushort[1 << GFBITS]; + ulong[] pivots = { 0 }; + + // generating the perm used to generate the private key + uint[] perm = new uint[1 << GFBITS]; + byte[] hash = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4)]; + int hash_idx = hash.Length - 32 - IRR_BYTES - ((1 << GFBITS) * 4); + + IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + digest.Update(64); + digest.BlockUpdate(sk, 0, 32); + ((IXof)digest).DoFinal(hash, 0, hash.Length); - hash_idx = hash.Length - 32 - IRR_BYTES - ((1 << GFBITS) * 4); for (int i = 0; i < (1 << GFBITS); i++) { perm[i] = Utils.Load4(hash, hash_idx + i * 4); } + PKGen(pk, sk, perm, pi, pivots); + return pk; + } + + // generates the rest of the private key given the first 40 bytes + public byte[] decompress_private_key(byte[] sk) + { + byte[] reg_sk = new byte[PrivateKeySize]; + Array.Copy(sk, 0, reg_sk, 0, sk.Length); + + // s: n/8 (random string) + // a: COND_BYTES (field ordering) ((2m-1) * 2^(m-4)) + // g: IRR_BYTES (polynomial) (t * 2) + + // generate hash using the seed given in the sk (64 || first 32 bytes) + byte[] hash = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4) + IRR_BYTES + 32]; + + int hash_idx = 0; + IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + digest.Update((byte)64); + digest.BlockUpdate(sk, 0, 32); // input + ((IXof)digest).DoFinal(hash, 0, hash.Length); + - if (usePivots) + // generate g + if (sk.Length <= 40) { - ulong[] pivots = {0}; - PKGen(null, reg_sk, perm, pi, pivots); + ushort[] field = new ushort[SYS_T]; + + byte[] reg_g = new byte[IRR_BYTES]; + hash_idx = hash.Length - 32 - IRR_BYTES; + for (int i = 0; i < SYS_T; i++) + { + field[i] = Utils.LoadGF(hash, hash_idx + i * 2, GFMASK); + } + GenerateIrrPoly(field); + + for (int i = 0; i < SYS_T; i++) + { + Utils.StoreGF(reg_g, i * 2, field[i]); + } + Array.Copy(reg_g, 0, reg_sk, 40, IRR_BYTES); } - else + + // generate a + if (sk.Length <= 40 + IRR_BYTES) { - long[] buf = new long[1 << GFBITS]; + uint[] perm = new uint[1 << GFBITS]; + ushort[] pi = new ushort[1 << GFBITS]; + + hash_idx = hash.Length - 32 - IRR_BYTES - ((1 << GFBITS) * 4); for (int i = 0; i < (1 << GFBITS); i++) { - buf[i] = perm[i]; - buf[i] <<= 31; - buf[i] |= i; - buf[i] &= 0x7fffffffffffffffL; // getting rid of signed longs + perm[i] = Utils.Load4(hash, hash_idx + i * 4); } - Sort64(buf, 0, buf.Length); - for (int i = 0; i < (1 << GFBITS); i++) + + if (usePivots) { - pi[i] = (ushort)(buf[i] & GFMASK); + ulong[] pivots = { 0 }; + PKGen(null, reg_sk, perm, pi, pivots); + } + else + { + long[] buf = new long[1 << GFBITS]; + for (int i = 0; i < (1 << GFBITS); i++) + { + buf[i] = perm[i]; + buf[i] <<= 31; + buf[i] |= i; + buf[i] &= 0x7fffffffffffffffL; // getting rid of signed longs + } + Sort64(buf, 0, buf.Length); + for (int i = 0; i < (1 << GFBITS); i++) + { + pi[i] = (ushort)(buf[i] & GFMASK); + } } - } - byte[] output = new byte[COND_BYTES]; - ControlBitsFromPermutation(output, pi, GFBITS, 1 << GFBITS); - //copy the controlbits from the permutation to the private key - Array.Copy(output, 0, reg_sk, IRR_BYTES + 40, output.Length); - } + byte[] output = new byte[COND_BYTES]; + ControlBitsFromPermutation(output, pi, GFBITS, 1 << GFBITS); + //copy the controlbits from the permutation to the private key + Array.Copy(output, 0, reg_sk, IRR_BYTES + 40, output.Length); + } - // reg s - Array.Copy(hash, 0, reg_sk, PrivateKeySize - SYS_N / 8, SYS_N / 8); - return reg_sk; - } + // reg s + Array.Copy(hash, 0, reg_sk, PrivateKeySize - SYS_N / 8, SYS_N / 8); + return reg_sk; + } - public void kem_keypair(byte[] pk, byte[] sk, SecureRandom random) - { - // 1. Generate a uniform random l-bit string δ. (This is called a seed.) - byte[] seed_a = new byte[1]; - byte[] seed_b = new byte[32]; - seed_a[0] = 64; - random.NextBytes(seed_b); - - //2. Output SeededKeyGen(δ). - // SeededKeyGen - byte[] E = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4) + (SYS_T * 2) + 32]; - int seedIndex, skIndex = 0; - byte[] prev_sk = seed_b; - ulong[] pivots = {0}; - - IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - while (true) + public void kem_keypair(byte[] pk, byte[] sk, SecureRandom random) { - // SeededKeyGen - 1. Compute E = G(δ), a string of n + σ2q + σ1t + l bits. (3488 + 32*4096 + 16*64 + 256) - digest.BlockUpdate(seed_a, 0, seed_a.Length); - digest.BlockUpdate(seed_b, 0, seed_b.Length); - ((IXof)digest).DoFinal(E, 0, E.Length); - // Store the seeds generated + // 1. Generate a uniform random l-bit string δ. (This is called a seed.) + byte[] seed_a = new byte[1]; + byte[] seed_b = new byte[32]; + seed_a[0] = 64; + random.NextBytes(seed_b); - // SeededKeyGen - 2. Define δ′ as the last l bits of E. - // Update seed using the last 32 bytes (l) of E - // If anything fails, this set δ ←δ′ (the next last 32 bytes of E) and restart the algorithm. - seedIndex = E.Length - 32; - seed_b = Arrays.CopyOfRange(E, seedIndex, seedIndex + 32); + //2. Output SeededKeyGen(δ). + // SeededKeyGen + byte[] E = new byte[(SYS_N / 8) + ((1 << GFBITS) * 4) + (SYS_T * 2) + 32]; + int seedIndex, skIndex = 0; + byte[] prev_sk = seed_b; + ulong[] pivots = { 0 }; - // store the previous last 32 bytes used as δ - Array.Copy(prev_sk, 0, sk, 0, 32); - prev_sk = Arrays.CopyOfRange(seed_b, 0, 32); + IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + while (true) + { + // SeededKeyGen - 1. Compute E = G(δ), a string of n + σ2q + σ1t + l bits. (3488 + 32*4096 + 16*64 + 256) + digest.BlockUpdate(seed_a, 0, seed_a.Length); + digest.BlockUpdate(seed_b, 0, seed_b.Length); + ((IXof)digest).DoFinal(E, 0, E.Length); + // Store the seeds generated - // (step 5 and 4 are swapped) - // SeededKeyGen - 5. Compute g from the next σ1t bits of E by the Irreducible algorithm. If this fails, - // set δ ←δ′ and restart the algorithm. + // SeededKeyGen - 2. Define δ′ as the last l bits of E. + // Update seed using the last 32 bytes (l) of E + // If anything fails, this set δ ←δ′ (the next last 32 bytes of E) and restart the algorithm. + seedIndex = E.Length - 32; + seed_b = Arrays.CopyOfRange(E, seedIndex, seedIndex + 32); - // Create Field which is an element in gf2^mt + // store the previous last 32 bytes used as δ + Array.Copy(prev_sk, 0, sk, 0, 32); + prev_sk = Arrays.CopyOfRange(seed_b, 0, 32); - // 2.4.1 Irreducible-polynomial generation - ushort[] field = new ushort[SYS_T]; - int sigma1_t = E.Length - 32 - (2 * SYS_T); - seedIndex = sigma1_t; + // (step 5 and 4 are swapped) + // SeededKeyGen - 5. Compute g from the next σ1t bits of E by the Irreducible algorithm. If this fails, + // set δ ←δ′ and restart the algorithm. + // Create Field which is an element in gf2^mt - // Irreducible 2.4.1 - 1. Define βj = ∑m−1 - // i=0 dσ1j+izi for each j ∈ {0,1,...,t −1}. (Within each group of σ1 - // input bits, this uses only the first m bits. - for (int i = 0; i < SYS_T; i++) - { - field[i] = Utils.LoadGF(E, sigma1_t + i * 2, GFMASK); - } + // 2.4.1 Irreducible-polynomial generation + ushort[] field = new ushort[SYS_T]; + int sigma1_t = E.Length - 32 - (2 * SYS_T); + seedIndex = sigma1_t; - if (GenerateIrrPoly(field) == -1) - { - continue; - } - // storing poly to sk - skIndex = 32 + 8; - for (int i = 0; i < SYS_T; i++) - { - Utils.StoreGF(sk, skIndex + i * 2, field[i]); - } + // Irreducible 2.4.1 - 1. Define βj = ∑m−1 + // i=0 dσ1j+izi for each j ∈ {0,1,...,t −1}. (Within each group of σ1 + // input bits, this uses only the first m bits. + for (int i = 0; i < SYS_T; i++) + { + field[i] = Utils.LoadGF(E, sigma1_t + i * 2, GFMASK); + } + + if (GenerateIrrPoly(field) == -1) + { + continue; + } - // SeededKeyGen - 4. Compute α1,...,αq from the next σ2q bits of E by the FieldOrdering algorithm. - // If this fails, set δ ←δ′ and restart the algorithm. + // storing poly to sk + skIndex = 32 + 8; + for (int i = 0; i < SYS_T; i++) + { + Utils.StoreGF(sk, skIndex + i * 2, field[i]); + } - // Generate permutation - uint[] perm = new uint[(1 << GFBITS)]; - seedIndex -= (1 << GFBITS) * 4; + // SeededKeyGen - 4. Compute α1,...,αq from the next σ2q bits of E by the FieldOrdering algorithm. + // If this fails, set δ ←δ′ and restart the algorithm. - // FieldOrdering 2.4.2 - 1. Take the first σ2 input bits b0,b1,...,bσ2−1 as a σ2-bit integer a0 = - // b0 + 2b1 + ··· + 2σ2−1bσ2−1, take the next σ2 bits as a σ2-bit integer a1, and so on through aq−1. + // Generate permutation + uint[] perm = new uint[(1 << GFBITS)]; + seedIndex -= (1 << GFBITS) * 4; + // FieldOrdering 2.4.2 - 1. Take the first σ2 input bits b0,b1,...,bσ2−1 as a σ2-bit integer a0 = + // b0 + 2b1 + ··· + 2σ2−1bσ2−1, take the next σ2 bits as a σ2-bit integer a1, and so on through aq−1. - for (int i = 0; i < (1 << GFBITS); i++) - { - perm[i] = Utils.Load4(E, seedIndex + i * 4); - } - // generating public key - ushort[] pi = new ushort[1 << GFBITS]; + + for (int i = 0; i < (1 << GFBITS); i++) + { + perm[i] = Utils.Load4(E, seedIndex + i * 4); + } + // generating public key + ushort[] pi = new ushort[1 << GFBITS]; - //8. Write Γ′ as (g,α′1,α′2,...,α′n) - if (PKGen(pk, sk, perm, pi, pivots) == -1) - { -// System.out.println("FAILED GENERATING PUBLIC KEY"); - continue; - } + //8. Write Γ′ as (g,α′1,α′2,...,α′n) + if (PKGen(pk, sk, perm, pi, pivots) == -1) + { + // System.out.println("FAILED GENERATING PUBLIC KEY"); + continue; + } - // computing c using Nassimi-Sahni algorithm which is a - // parallel algorithms to set up the Benes permutation network + // computing c using Nassimi-Sahni algorithm which is a + // parallel algorithms to set up the Benes permutation network - byte[] output = new byte[COND_BYTES]; - ControlBitsFromPermutation(output, pi, GFBITS, 1 << GFBITS); + byte[] output = new byte[COND_BYTES]; + ControlBitsFromPermutation(output, pi, GFBITS, 1 << GFBITS); - //copy the controlbits from the permutation to the private key - Array.Copy(output, 0, sk, IRR_BYTES + 40, output.Length); + //copy the controlbits from the permutation to the private key + Array.Copy(output, 0, sk, IRR_BYTES + 40, output.Length); - // storing the random string s - seedIndex -= SYS_N / 8; - Array.Copy(E, seedIndex, sk, sk.Length - SYS_N / 8, SYS_N / 8); + // storing the random string s + seedIndex -= SYS_N / 8; + Array.Copy(E, seedIndex, sk, sk.Length - SYS_N / 8, SYS_N / 8); - // This part is reserved for compression which is not implemented and is not required - if (!usePivots) - { - Utils.Store8(sk, 32, 0xFFFFFFFFL); - } - else - { - Utils.Store8(sk, 32, pivots[0]); - } + // This part is reserved for compression which is not implemented and is not required + if (!usePivots) + { + Utils.Store8(sk, 32, 0xFFFFFFFFL); + } + else + { + Utils.Store8(sk, 32, pivots[0]); + } - // 9. Output T as public key and (δ,c,g,α,s) as private key, where c = (cn−k−μ+1,...,cn−k) - // and α = (α′1,...,α′n,αn+1,...,αq - break; + // 9. Output T as public key and (δ,c,g,α,s) as private key, where c = (cn−k−μ+1,...,cn−k) + // and α = (α′1,...,α′n,αn+1,...,αq + break; + } } - } - // 2.2.3 Encoding subroutine - private void Syndrome(byte[] cipher_text, byte[] pk, byte[] error_vector) - { - /* - 2.2.3 Encoding subroutine - 1. Define H = (In−k |T) - 2. Compute and return C0 = He ∈Fn−k2 . - */ - short[] row = new short[SYS_N / 8]; - int i, j, pk_ptr = 0; - byte b; - int tail = PK_NROWS % 8; - - for (i = 0; i < SYND_BYTES; i++) + // 2.2.3 Encoding subroutine + private void Syndrome(byte[] cipher_text, byte[] pk, byte[] error_vector) { - cipher_text[i] = 0; - } + /* + 2.2.3 Encoding subroutine + 1. Define H = (In−k |T) + 2. Compute and return C0 = He ∈Fn−k2 . + */ + short[] row = new short[SYS_N / 8]; + int i, j, pk_ptr = 0; + byte b; + int tail = PK_NROWS % 8; - for (i = 0; i < PK_NROWS; i++) - { - for (j = 0; j < SYS_N / 8; j++) + for (i = 0; i < SYND_BYTES; i++) { - row[j] = 0; + cipher_text[i] = 0; } - for (j = 0; j < PK_ROW_BYTES; j++) - { - row[SYS_N / 8 - PK_ROW_BYTES + j] = pk[pk_ptr + j]; - } - if (usePadding) + for (i = 0; i < PK_NROWS; i++) { - for (j = SYS_N / 8 - 1; j >= SYS_N / 8 - PK_ROW_BYTES; j--) + for (j = 0; j < SYS_N / 8; j++) { - row[j] = (short)((((row[j] & 0xff) << tail) | ((row[j - 1] & 0xff) >> (8 - tail))) & 0xff); + row[j] = 0; } - } + for (j = 0; j < PK_ROW_BYTES; j++) + { + row[SYS_N / 8 - PK_ROW_BYTES + j] = pk[pk_ptr + j]; + } + if (usePadding) + { + for (j = SYS_N / 8 - 1; j >= SYS_N / 8 - PK_ROW_BYTES; j--) + { + row[j] = (short)((((row[j] & 0xff) << tail) | ((row[j - 1] & 0xff) >> (8 - tail))) & 0xff); + } + } - row[i / 8] |= (short) (1 << (i % 8)); - b = 0; - for (j = 0; j < SYS_N / 8; j++) - { - b ^= (byte) (row[j] & error_vector[j]); - } + row[i / 8] |= (short)(1 << (i % 8)); + + b = 0; + for (j = 0; j < SYS_N / 8; j++) + { + b ^= (byte)(row[j] & error_vector[j]); + } - b ^= (byte) (b >> 4); - b ^= (byte) (b >> 2); - b ^= (byte) (b >> 1); - b &= 1; + b ^= (byte)(b >> 4); + b ^= (byte)(b >> 2); + b ^= (byte)(b >> 1); + b &= 1; - cipher_text[i / 8] |= (byte)(b << (i % 8)); + cipher_text[i / 8] |= (byte)(b << (i % 8)); - pk_ptr += PK_ROW_BYTES; + pk_ptr += PK_ROW_BYTES; + } } - } - // 2.4.4 Fixed-weight-vector generation - private void GenerateErrorVector(byte[] error_vector, SecureRandom random) - { - byte[] buf_bytes; - ushort[] buf_nums = new ushort[SYS_T * 2]; - ushort[] ind = new ushort[SYS_T]; - byte[] val = new byte[SYS_T]; - - /* - 2.4.4 Fixed-weight-vector generation - 1. Generate σ1τ uniform random bits b0,b1,...,bσ1τ−1. - */ - while (true) + // 2.4.4 Fixed-weight-vector generation + private void GenerateErrorVector(byte[] error_vector, SecureRandom random) { + byte[] buf_bytes; + ushort[] buf_nums = new ushort[SYS_T * 2]; + ushort[] ind = new ushort[SYS_T]; + byte[] val = new byte[SYS_T]; /* 2.4.4 Fixed-weight-vector generation - 2. Define dj = ∑m−1 - i=0 bσ1j+i2i for each j ∈{0,1,...,τ −1}. - */ - if (countErrorIndices) + 1. Generate σ1τ uniform random bits b0,b1,...,bσ1τ−1. + */ + while (true) { - buf_bytes = new byte[SYS_T * 4]; - - random.NextBytes(buf_bytes); - for (int i = 0; i < SYS_T * 2; i++) - { - buf_nums[i] = Utils.LoadGF(buf_bytes, i * 2, GFMASK); - } /* 2.4.4 Fixed-weight-vector generation - 3. Define a0,a1,...,at−1 as the first t entries in d0,d1,...,dτ−1 in the range - {0,1,...,n −1}. If there are fewer than t such entries, restart the algorithm + 2. Define dj = ∑m−1 + i=0 bσ1j+i2i for each j ∈{0,1,...,τ −1}. */ + if (countErrorIndices) + { + buf_bytes = new byte[SYS_T * 4]; + + random.NextBytes(buf_bytes); + for (int i = 0; i < SYS_T * 2; i++) + { + buf_nums[i] = Utils.LoadGF(buf_bytes, i * 2, GFMASK); + } + + /* + 2.4.4 Fixed-weight-vector generation + 3. Define a0,a1,...,at−1 as the first t entries in d0,d1,...,dτ−1 in the range + {0,1,...,n −1}. If there are fewer than t such entries, restart the algorithm + */ + + // moving and counting indices in the correct range + int count = 0; + for (int i = 0; i < SYS_T * 2 && count < SYS_T; i++) + { + if (buf_nums[i] < SYS_N) + { + ind[count++] = buf_nums[i]; + } + } - // moving and counting indices in the correct range - int count = 0; - for (int i = 0; i < SYS_T * 2 && count < SYS_T; i++) + if (count < SYS_T) + { + // Failed Encrypt indices wrong range + continue; + } + } + else { - if (buf_nums[i] < SYS_N) + buf_bytes = new byte[SYS_T * 2]; + random.NextBytes(buf_bytes); + + for (int i = 0; i < SYS_T; i++) { - ind[count++] = buf_nums[i]; + ind[i] = Utils.LoadGF(buf_bytes, i * 2, GFMASK); } } - if (count < SYS_T) + + /* + 2.4.4 Fixed-weight-vector generation + 4. If a0,a1,...,at−1 are not all distinct, restart the algorithm. + */ + int eq = 0; + // check for repetition + for (int i = 1; i < SYS_T && eq != 1; i++) { - // Failed Encrypt indices wrong range - continue; + for (int j = 0; j < i; j++) + { + if (ind[i] == ind[j]) + { + eq = 1; + break; + } + } } - } - else - { - buf_bytes = new byte[SYS_T * 2]; - random.NextBytes(buf_bytes); - for (int i = 0; i < SYS_T; i++) + if (eq == 0) { - ind[i] = Utils.LoadGF(buf_bytes, i * 2, GFMASK); + break; + } + else + { + //Failed Encrypt found duplicate } } /* 2.4.4 Fixed-weight-vector generation - 4. If a0,a1,...,at−1 are not all distinct, restart the algorithm. + 5. Define e = (e0,e1,...,en−1) ∈ Fn2 as the weight-t vector such that eai = 1 for each i. + (Implementors are cautioned to compute e through arithmetic rather than variable- + time RAM lookups.) */ - int eq = 0; - // check for repetition - for (int i = 1; i < SYS_T && eq != 1; i++) - { - for (int j = 0; j < i; j++) - { - if (ind[i] == ind[j]) - { - eq = 1; - break; - } - } - } - - if (eq == 0) + for (int i = 0; i < SYS_T; i++) { - break; + val[i] = (byte)(1 << (ind[i] & 7)); } - else + for (short i = 0; i < SYS_N / 8; i++) { - //Failed Encrypt found duplicate - } - } - - - /* - 2.4.4 Fixed-weight-vector generation - 5. Define e = (e0,e1,...,en−1) ∈ Fn2 as the weight-t vector such that eai = 1 for each i. - (Implementors are cautioned to compute e through arithmetic rather than variable- - time RAM lookups.) - */ - for (int i = 0; i < SYS_T; i++) - { - val[i] = (byte)(1 << (ind[i] & 7)); - } - for (short i = 0; i < SYS_N / 8; i++) - { - error_vector[i] = 0; + error_vector[i] = 0; - for (int j = 0; j < SYS_T; j++) - { - short mask = SameMask32(i, (short)(ind[j] >> 3)); - mask &= 0xff; - error_vector[i] |= (byte) (val[j] & mask); + for (int j = 0; j < SYS_T; j++) + { + short mask = SameMask32(i, (short)(ind[j] >> 3)); + mask &= 0xff; + error_vector[i] |= (byte)(val[j] & mask); + } } } - } - - private void Encrypt(byte[] cipher_text, byte[] pk, byte[] error_vector, SecureRandom random) - { - /* - 2.4.5 Encapsulation - 1. Use FixedWeight to generate a vector e ∈Fn2 of weight t. - */ - // 2.4.4 Fixed-weight-vector generation - GenerateErrorVector(error_vector, random); + private void Encrypt(byte[] cipher_text, byte[] pk, byte[] error_vector, SecureRandom random) + { + /* + 2.4.5 Encapsulation + 1. Use FixedWeight to generate a vector e ∈Fn2 of weight t. + */ - /* - 2.4.5 Encapsulation - 2. Compute C0 = Encode(e,T). - */ - Syndrome(cipher_text, pk, error_vector); - } + // 2.4.4 Fixed-weight-vector generation + GenerateErrorVector(error_vector, random); - // 2.4.5 Encapsulation - public int kem_enc(byte[] cipher_text, byte[] key, byte[] pk, SecureRandom random) - { - byte[] error_vector = new byte[SYS_N / 8]; - byte mask; - int i, padding_ok = 0; - if (usePadding) - { - padding_ok = CheckPKPadding(pk); -// System.out.println("padding_ok: " + padding_ok); + /* + 2.4.5 Encapsulation + 2. Compute C0 = Encode(e,T). + */ + Syndrome(cipher_text, pk, error_vector); } - /* - 2.4.5 Encapsulation - 1. Use FixedWeight to generate a vector e ∈Fn2 of weight t. - 2. Compute C0 = Encode(e,T). - */ - Encrypt(cipher_text, pk, error_vector, random); - - /* - 2.4.5 Encapsulation - 3. Compute C1 = H(2,e); Put C = (C0,C1) - */ - - // C1 = 0x2 || error_vector - // C = C0 || SHAKE256(C1, 32) - IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - digest.Update((byte)0x02); - digest.BlockUpdate(error_vector, 0, error_vector.Length); // input - ((IXof)digest).DoFinal(cipher_text, SYND_BYTES, cipher_text.Length - SYND_BYTES); // output - - /* - 2.4.5 Encapsulation - 4. Compute K = H(1,e,C) - */ - - // K = Hash((0x1 || e || C), 32) - digest.Update((byte)0x01); - digest.BlockUpdate(error_vector, 0, error_vector.Length); - digest.BlockUpdate(cipher_text, 0, cipher_text.Length); // input - ((IXof)digest).DoFinal(key, 0, key.Length); // output - - if (usePadding) + // 2.4.5 Encapsulation + public int kem_enc(byte[] cipher_text, byte[] key, byte[] pk, SecureRandom random) { - // - // clear outputs (set to all 0's) if padding bits are not all zero - mask = (byte)padding_ok; - mask ^= 0xFF; - - for (i = 0; i < SYND_BYTES + 32; i++) - { - cipher_text[i] &= mask; - } - - for (i = 0; i < 32; i++) + byte[] error_vector = new byte[SYS_N / 8]; + byte mask; + int i, padding_ok = 0; + if (usePadding) { - key[i] &= mask; + padding_ok = CheckPKPadding(pk); + // System.out.println("padding_ok: " + padding_ok); } - return padding_ok; - } - return 0; - } + /* + 2.4.5 Encapsulation + 1. Use FixedWeight to generate a vector e ∈Fn2 of weight t. + 2. Compute C0 = Encode(e,T). + */ + Encrypt(cipher_text, pk, error_vector, random); - // 2.3.3 Decapsulation - public int kem_dec(byte[] key, byte[] cipher_text, byte[] sk) - { - byte[] conf = new byte[32]; - byte[] error_vector = new byte[SYS_N / 8]; + /* + 2.4.5 Encapsulation + 3. Compute C1 = H(2,e); Put C = (C0,C1) + */ - int i, padding_ok = 0; - byte mask; - if (usePadding) - { - padding_ok = CheckCPadding(cipher_text); - } + // C1 = 0x2 || error_vector + // C = C0 || SHAKE256(C1, 32) + IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + digest.Update((byte)0x02); + digest.BlockUpdate(error_vector, 0, error_vector.Length); // input + ((IXof)digest).DoFinal(cipher_text, SYND_BYTES, cipher_text.Length - SYND_BYTES); // output - /* - 2.3.3 Decapsulation - 4. Compute e ←Decode(C0,Γ′). If e = ⊥, set e ←s and b ←0. - */ + /* + 2.4.5 Encapsulation + 4. Compute K = H(1,e,C) + */ - // Decrypt - byte ret_decrypt = (byte) Decrypt(error_vector, sk, cipher_text); + // K = Hash((0x1 || e || C), 32) + digest.Update((byte)0x01); + digest.BlockUpdate(error_vector, 0, error_vector.Length); + digest.BlockUpdate(cipher_text, 0, cipher_text.Length); // input + ((IXof)digest).DoFinal(key, 0, key.Length); // output + if (usePadding) + { + // + // clear outputs (set to all 0's) if padding bits are not all zero + mask = (byte)padding_ok; + mask ^= 0xFF; - /* - 2.3.3 Decapsulation - 5. Compute C′1 = H(2,e) - */ + for (i = 0; i < SYND_BYTES + 32; i++) + { + cipher_text[i] &= mask; + } - // 0x2 || error_vector - IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - digest.Update((byte)0x02); - digest.BlockUpdate(error_vector, 0, error_vector.Length); // input - ((IXof)digest).DoFinal(conf, 0, conf.Length); // output + for (i = 0; i < 32; i++) + { + key[i] &= mask; + } - /* - 2.3.3 Decapsulation - 6. If C′1 6= C1, set e ←s and b ←0. - */ - byte ret_confirm = 0; - for (i = 0; i < 32; i++) - { - ret_confirm |= (byte) (conf[i] ^ cipher_text[SYND_BYTES + i]); + return padding_ok; + } + return 0; } - short m; - m = (short)(ret_decrypt | ret_confirm); - m -= 1; - m >>= 8; - m &= 0xff; + // 2.3.3 Decapsulation + public int kem_dec(byte[] key, byte[] cipher_text, byte[] sk) + { + byte[] conf = new byte[32]; + byte[] error_vector = new byte[SYS_N / 8]; - byte[] preimage = new byte[1 + SYS_N / 8 + (SYND_BYTES + 32)]; + int i, padding_ok = 0; + byte mask; + if (usePadding) + { + padding_ok = CheckCPadding(cipher_text); + } - /* - 2.3.3 Decapsulation - 2. Set b ←1. - */ - preimage[0] = (byte)(m & 1); - for (i = 0; i < SYS_N / 8; i++) - { - preimage[1 + i] = (byte)((~m & sk[i + 40 + IRR_BYTES + COND_BYTES]) | (m & error_vector[i])); - } - for (i = 0; i < SYND_BYTES + 32; i++) - { - preimage[1 + SYS_N / 8 + i] = cipher_text[i]; - } + /* + 2.3.3 Decapsulation + 4. Compute e ←Decode(C0,Γ′). If e = ⊥, set e ←s and b ←0. + */ - /* - 2.3.3 Decapsulation - 7. Compute K = H(b,e,C) - */ + // Decrypt + byte ret_decrypt = (byte)Decrypt(error_vector, sk, cipher_text); - // = SHAKE256(preimage, 32) - digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); - digest.BlockUpdate(preimage, 0, preimage.Length); // input - ((IXof)digest).DoFinal(key, 0, key.Length); // output + /* + 2.3.3 Decapsulation + 5. Compute C′1 = H(2,e) + */ - // clear outputs (set to all 1's) if padding bits are not all zero - if (usePadding) - { - mask = (byte)padding_ok; + // 0x2 || error_vector + IDigest digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + digest.Update((byte)0x02); + digest.BlockUpdate(error_vector, 0, error_vector.Length); // input + ((IXof)digest).DoFinal(conf, 0, conf.Length); // output - for (i = 0; i < key.Length; i++) + /* + 2.3.3 Decapsulation + 6. If C′1 6= C1, set e ←s and b ←0. + */ + byte ret_confirm = 0; + for (i = 0; i < 32; i++) { - key[i] |= mask; + ret_confirm |= (byte)(conf[i] ^ cipher_text[SYND_BYTES + i]); } + short m; - return padding_ok; - } - return 0; - } - - // 2.2.4 Decoding subroutine - // Niederreiter decryption with the Berlekamp decoder - private int Decrypt(byte[] error_vector, byte[] sk, byte[] cipher_text) - { - - ushort[] g = new ushort[SYS_T + 1]; - ushort[] L = new ushort[SYS_N]; - - ushort[] s = new ushort[SYS_T * 2]; - ushort[] s_cmp = new ushort[SYS_T * 2]; - ushort[] locator = new ushort[SYS_T + 1]; - ushort[] images = new ushort[SYS_N]; - - ushort t; + m = (short)(ret_decrypt | ret_confirm); + m -= 1; + m >>= 8; + m &= 0xff; - byte[] r = new byte[SYS_N / 8]; + byte[] preimage = new byte[1 + SYS_N / 8 + (SYND_BYTES + 32)]; - /* - 2.2.4 Decoding subroutine - 1. Extend C0 to v = (C0,0,...,0) ∈Fn2 by appending k zeros. - */ - for (int i = 0; i < SYND_BYTES; i++) - { - r[i] = cipher_text[i]; - } - - for (int i = SYND_BYTES; i < SYS_N / 8; i++) - { - r[i] = 0; - } - - for (int i = 0; i < SYS_T; i++) - { - g[i] = Utils.LoadGF(sk, 40 + i * 2, GFMASK); - } - g[SYS_T] = 1; - - /* - 2.2.4 Decoding subroutine - 2. Find the unique codeword c in the Goppa code defined by Γ′ that is at distance ≤t - from v. If there is no such codeword, return ⊥. - */ + /* + 2.3.3 Decapsulation + 2. Set b ←1. + */ + preimage[0] = (byte)(m & 1); + for (i = 0; i < SYS_N / 8; i++) + { + preimage[1 + i] = (byte)((~m & sk[i + 40 + IRR_BYTES + COND_BYTES]) | (m & error_vector[i])); + } + for (i = 0; i < SYND_BYTES + 32; i++) + { + preimage[1 + SYS_N / 8 + i] = cipher_text[i]; + } - // support gen - benes.SupportGen(L, sk); + /* + 2.3.3 Decapsulation + 7. Compute K = H(b,e,C) + */ - // compute syndrome - Synd(s, g, L, r); + // = SHAKE256(preimage, 32) + digest = DigestUtilities.GetDigest(NistObjectIdentifiers.IdShake256); + digest.BlockUpdate(preimage, 0, preimage.Length); // input + ((IXof)digest).DoFinal(key, 0, key.Length); // output - // compute minimal polynomial of syndrome - BM(locator, s); - // calculate the root for locator in L - Root(images, locator, L); + // clear outputs (set to all 1's) if padding bits are not all zero + if (usePadding) + { + mask = (byte)padding_ok; + for (i = 0; i < key.Length; i++) + { + key[i] |= mask; + } - /* - 2.2.4 Decoding subroutine - 3. Set e = v + c. - */ - for (int i = 0; i < SYS_N / 8; i++) - { - error_vector[i] = 0; + return padding_ok; + } + return 0; } - int w = 0; - for (int i = 0; i < SYS_N; i++) + // 2.2.4 Decoding subroutine + // Niederreiter decryption with the Berlekamp decoder + private int Decrypt(byte[] error_vector, byte[] sk, byte[] cipher_text) { - t = (ushort)(gf.GFIsZero(images[i]) & 1); - error_vector[i / 8] |= (byte) (t << (i % 8)); - w += t; - } + ushort[] g = new ushort[SYS_T + 1]; + ushort[] L = new ushort[SYS_N]; - // compute syndrome - Synd(s_cmp, g, L, error_vector); + ushort[] s = new ushort[SYS_T * 2]; + ushort[] s_cmp = new ushort[SYS_T * 2]; + ushort[] locator = new ushort[SYS_T + 1]; + ushort[] images = new ushort[SYS_N]; - /* - 2.2.4 Decoding subroutine - 4. If wt(e) = t and C0 = He, return e. Otherwise return ⊥ - */ - int check; - check = w; - check ^= SYS_T; + ushort t; - for (int i = 0; i < SYS_T * 2; i++) - { - check |= s[i] ^ s_cmp[i]; - } - check -= 1; - check >>= 15; - check &= 0x1; - if ((check ^ 1) != 0) - { - //TODO throw exception? -// System.out.println("Decryption failed"); - } - return check ^ 1; - } + byte[] r = new byte[SYS_N / 8]; - private static int Min(ushort a, int b) - { - if (a < b) - { - return a; - } - return b; - } + /* + 2.2.4 Decoding subroutine + 1. Extend C0 to v = (C0,0,...,0) ∈Fn2 by appending k zeros. + */ + for (int i = 0; i < SYND_BYTES; i++) + { + r[i] = cipher_text[i]; + } - /* the Berlekamp-Massey algorithm */ - /* input: s, sequence of field elements */ - /* output: out, minimal polynomial of s */ - private void BM(ushort[] output, ushort[] s) - { - int i; + for (int i = SYND_BYTES; i < SYS_N / 8; i++) + { + r[i] = 0; + } - ushort N = 0; - ushort L = 0; - ushort mle; - ushort mne; + for (int i = 0; i < SYS_T; i++) + { + g[i] = Utils.LoadGF(sk, 40 + i * 2, GFMASK); + } + g[SYS_T] = 1; - ushort[] T = new ushort[SYS_T + 1]; - ushort[] C = new ushort[SYS_T + 1]; - ushort[] B = new ushort[SYS_T + 1]; + /* + 2.2.4 Decoding subroutine + 2. Find the unique codeword c in the Goppa code defined by Γ′ that is at distance ≤t + from v. If there is no such codeword, return ⊥. + */ - ushort b = 1, d, f; - // + // support gen + benes.SupportGen(L, sk); - for (i = 0; i < SYS_T + 1; i++) - { - C[i] = B[i] = 0; - } + // compute syndrome + Synd(s, g, L, r); - B[1] = C[0] = 1; + // compute minimal polynomial of syndrome + BM(locator, s); - // + // calculate the root for locator in L + Root(images, locator, L); - for (N = 0; N < 2 * SYS_T; N++) - { - d = 0; - for (i = 0; i <= Min(N, SYS_T); i++) + /* + 2.2.4 Decoding subroutine + 3. Set e = v + c. + */ + for (int i = 0; i < SYS_N / 8; i++) { - d ^= gf.GFMul(C[i], s[N - i]); + error_vector[i] = 0; } - mne = d; - mne -= 1; - mne >>= 15; - mne &= 0x1; - mne -= 1; - mle = N; - mle -= (ushort) (2 * L); - mle >>= 15; - mle &= 0x1; - mle -= 1; - mle &= mne; - - for (i = 0; i <= SYS_T; i++) + int w = 0; + for (int i = 0; i < SYS_N; i++) { - T[i] = C[i]; + t = (ushort)(gf.GFIsZero(images[i]) & 1); + + error_vector[i / 8] |= (byte)(t << (i % 8)); + w += t; } - f = gf.GFFrac(b, d); + // compute syndrome + Synd(s_cmp, g, L, error_vector); - for (i = 0; i <= SYS_T; i++) - { - C[i] ^= (ushort) (gf.GFMul(f, B[i]) & mne); - } - L = (ushort)((L & ~mle) | ((N + 1 - L) & mle)); + /* + 2.2.4 Decoding subroutine + 4. If wt(e) = t and C0 = He, return e. Otherwise return ⊥ + */ + int check; + check = w; + check ^= SYS_T; - for (i = 0; i <= SYS_T; i++) + for (int i = 0; i < SYS_T * 2; i++) { - B[i] = (ushort)((B[i] & ~mle) | (T[i] & mle)); + check |= s[i] ^ s_cmp[i]; } - - b = (ushort)((b & ~mle) | (d & mle)); - - for (i = SYS_T; i >= 1; i--) + check -= 1; + check >>= 15; + check &= 0x1; + if ((check ^ 1) != 0) { - B[i] = B[i - 1]; + //TODO throw exception? + // System.out.println("Decryption failed"); } - - B[0] = 0; + return check ^ 1; } - for (i = 0; i <= SYS_T; i++) + private static int Min(ushort a, int b) { - output[i] = C[SYS_T - i]; + if (a < b) + { + return a; + } + return b; } - } - - /* input: Goppa polynomial f, support L, received word r */ - /* output: out, the syndrome of length 2t */ - private void Synd(ushort[] output, ushort[] f, ushort[] L, byte[] r) - { - int i, j; - ushort e, e_inv, c; - for (j = 0; j < 2 * SYS_T; j++) + /* the Berlekamp-Massey algorithm */ + /* input: s, sequence of field elements */ + /* output: out, minimal polynomial of s */ + private void BM(ushort[] output, ushort[] s) { - output[j] = 0; - } + int i; - for (i = 0; i < SYS_N; i++) - { - c = (ushort)((r[i / 8] >> (i % 8)) & 1); + ushort N = 0; + ushort L = 0; + ushort mle; + ushort mne; - e = Eval(f, L[i]); - e_inv = gf.GFInv(gf.GFMul(e, e)); + ushort[] T = new ushort[SYS_T + 1]; + ushort[] C = new ushort[SYS_T + 1]; + ushort[] B = new ushort[SYS_T + 1]; - for (j = 0; j < 2 * SYS_T; j++) + ushort b = 1, d, f; + // + + for (i = 0; i < SYS_T + 1; i++) { - output[j] = gf.GFAdd(output[j], gf.GFMul(e_inv, c)); - e_inv = gf.GFMul(e_inv, L[i]); + C[i] = B[i] = 0; } - } - } - - private int MovColumns(byte[][] mat, ushort[] pi, ulong[] pivots) - { - int i, j, k, s, block_idx, row, tail; - ulong[] buf = new ulong[64], - ctz_list = new ulong[32]; - ulong t, d, mask, one = 1; - byte[] tmp = new byte[9]; // Used for padding + B[1] = C[0] = 1; - row = PK_NROWS - 32; - block_idx = row / 8; - tail = row % 8; + // - // extract the 32x64 matrix - if (usePadding) - { - for (i = 0; i < 32; i++) + for (N = 0; N < 2 * SYS_T; N++) { - for (j = 0; j < 9; j++) + d = 0; + + for (i = 0; i <= Min(N, SYS_T); i++) { - tmp[j] = mat[row + i][block_idx + j]; + d ^= gf.GFMul(C[i], s[N - i]); } - for (j = 0; j < 8; j++) + + mne = d; + mne -= 1; + mne >>= 15; + mne &= 0x1; + mne -= 1; + mle = N; + mle -= (ushort)(2 * L); + mle >>= 15; + mle &= 0x1; + mle -= 1; + mle &= mne; + + for (i = 0; i <= SYS_T; i++) { - tmp[j] = (byte)(((tmp[j] & 0xff) >> tail) | (tmp[j + 1] << (8 - tail))); + T[i] = C[i]; } - buf[i] = Utils.Load8(tmp, 0); - } - } - else - { - for (i = 0; i < 32; i++) - { - buf[i] = Utils.Load8(mat[row + i], block_idx); - } - } + f = gf.GFFrac(b, d); + for (i = 0; i <= SYS_T; i++) + { + C[i] ^= (ushort)(gf.GFMul(f, B[i]) & mne); + } + L = (ushort)((L & ~mle) | ((N + 1 - L) & mle)); - // compute the column indices of pivots by Gaussian elimination. - // the indices are stored in ctz_list + for (i = 0; i <= SYS_T; i++) + { + B[i] = (ushort)((B[i] & ~mle) | (T[i] & mle)); + } - pivots[0] = 0; + b = (ushort)((b & ~mle) | (d & mle)); - for (i = 0; i < 32; i++) - { - t = buf[i]; - for (j = i + 1; j < 32; j++) - { - t |= buf[j]; + for (i = SYS_T; i >= 1; i--) + { + B[i] = B[i - 1]; + } + + B[0] = 0; } - if (t == 0) + for (i = 0; i <= SYS_T; i++) { - return -1; // return if buf is not full rank + output[i] = C[SYS_T - i]; } + } - s = Ctz(t); - ctz_list[i] = (ulong) s; - pivots[0] |= one << (int)ctz_list[i]; + /* input: Goppa polynomial f, support L, received word r */ + /* output: out, the syndrome of length 2t */ + private void Synd(ushort[] output, ushort[] f, ushort[] L, byte[] r) + { + int i, j; + ushort e, e_inv, c; - for (j = i + 1; j < 32; j++) + for (j = 0; j < 2 * SYS_T; j++) { - mask = (buf[i] >> s) & 1; - mask -= 1; - buf[i] ^= buf[j] & mask; + output[j] = 0; } - for (j = i + 1; j < 32; j++) + + for (i = 0; i < SYS_N; i++) { - mask = (buf[j] >> s) & 1; - mask = (ulong)-(long)mask;//todo replace with ~? - buf[j] ^= buf[i] & mask; - } - } + c = (ushort)((r[i / 8] >> (i % 8)) & 1); - // updating permutation + e = Eval(f, L[i]); + e_inv = gf.GFInv(gf.GFMul(e, e)); - for (j = 0; j < 32; j++) - { - for (k = j + 1; k < 64; k++) - { - d = (ulong) (pi[row + j] ^ pi[row + k]); - d &= SameMask64((ushort)k, (ushort)ctz_list[j]); - pi[row + j] ^= (ushort) d; - pi[row + k] ^= (ushort) d; + for (j = 0; j < 2 * SYS_T; j++) + { + output[j] = gf.GFAdd(output[j], gf.GFMul(e_inv, c)); + e_inv = gf.GFMul(e_inv, L[i]); + } } } - // moving columns of mat according to the column indices of pivots - - for (i = 0; i < PK_NROWS; i++) + private int MovColumns(byte[][] mat, ushort[] pi, ulong[] pivots) { + int i, j, k, s, block_idx, row, tail; + ulong[] buf = new ulong[64], + ctz_list = new ulong[32]; + ulong t, d, mask, one = 1; + + byte[] tmp = new byte[9]; // Used for padding + + row = PK_NROWS - 32; + block_idx = row / 8; + tail = row % 8; + + // extract the 32x64 matrix if (usePadding) { - for (k = 0; k < 9; k++) - { - tmp[k] = mat[i][block_idx + k]; - } - for (k = 0; k < 8; k++) + for (i = 0; i < 32; i++) { - tmp[k] = (byte)(((tmp[k] & 0xff) >> tail) | (tmp[k + 1] << (8 - tail))); + for (j = 0; j < 9; j++) + { + tmp[j] = mat[row + i][block_idx + j]; + } + for (j = 0; j < 8; j++) + { + tmp[j] = (byte)(((tmp[j] & 0xff) >> tail) | (tmp[j + 1] << (8 - tail))); + } + + buf[i] = Utils.Load8(tmp, 0); } - t = Utils.Load8(tmp, 0); } else { - t = Utils.Load8(mat[i], block_idx); + for (i = 0; i < 32; i++) + { + buf[i] = Utils.Load8(mat[row + i], block_idx); + } } - for (j = 0; j < 32; j++) - { - d = t >> j; - d ^= t >> (int)ctz_list[j]; - d &= 1; - t ^= d << (int)ctz_list[j]; - t ^= d << j; - } - if (usePadding) - { - Utils.Store8(tmp, 0, t); + // compute the column indices of pivots by Gaussian elimination. + // the indices are stored in ctz_list - mat[i][block_idx + 8] = (byte)(((mat[i][block_idx + 8] & 0xff) >> tail << tail) | ((tmp[7] & 0xff) >> (8 - tail))); - mat[i][block_idx + 0] = (byte)(((tmp[0] & 0xff) << tail) | ((mat[i][block_idx] & 0xff) << (8 - tail) >> (8 - tail))); + pivots[0] = 0; - for (k = 7; k >= 1; k--) + for (i = 0; i < 32; i++) + { + t = buf[i]; + for (j = i + 1; j < 32; j++) { - mat[i][block_idx + k] = (byte)(((tmp[k] & 0xff) << tail) | ((tmp[k - 1] & 0xff) >> (8 - tail))); + t |= buf[j]; } - } - else - { - Utils.Store8(mat[i], block_idx, t); - } - } - return 0; - } + if (t == 0) + { + return -1; // return if buf is not full rank + } - /* return number of trailing zeros of the non-zero input in */ - private static int Ctz(ulong input) - { - int i, b, m = 0, r = 0; + s = Ctz(t); + ctz_list[i] = (ulong)s; + pivots[0] |= one << (int)ctz_list[i]; - for (i = 0; i < 64; i++) - { - b = (int)((input >> i) & 1); - m |= b; - r += (m ^ 1) & (b ^ 1); - } + for (j = i + 1; j < 32; j++) + { + mask = (buf[i] >> s) & 1; + mask -= 1; + buf[i] ^= buf[j] & mask; + } + for (j = i + 1; j < 32; j++) + { + mask = (buf[j] >> s) & 1; + mask = (ulong)-(long)mask;//todo replace with ~? + buf[j] ^= buf[i] & mask; + } + } - return r; - } + // updating permutation - /* Used in mov columns*/ - static private ulong SameMask64(ushort x, ushort y) - { - ulong mask; + for (j = 0; j < 32; j++) + { + for (k = j + 1; k < 64; k++) + { + d = (ulong)(pi[row + j] ^ pi[row + k]); + d &= SameMask64((ushort)k, (ushort)ctz_list[j]); + pi[row + j] ^= (ushort)d; + pi[row + k] ^= (ushort)d; + } + } - mask = (ulong)(x ^ y); - mask -= 1; - mask >>= 63; - mask = (ulong)-(long)mask; // todo change with ~ + // moving columns of mat according to the column indices of pivots - return mask; - } + for (i = 0; i < PK_NROWS; i++) + { + if (usePadding) + { + for (k = 0; k < 9; k++) + { + tmp[k] = mat[i][block_idx + k]; + } + for (k = 0; k < 8; k++) + { + tmp[k] = (byte)(((tmp[k] & 0xff) >> tail) | (tmp[k + 1] << (8 - tail))); + } + t = Utils.Load8(tmp, 0); + } + else + { + t = Utils.Load8(mat[i], block_idx); + } - /* Used in error vector generation*/ - private static byte SameMask32(short x, short y) - { - uint mask; + for (j = 0; j < 32; j++) + { + d = t >> j; + d ^= t >> (int)ctz_list[j]; + d &= 1; - mask = (uint) (x ^ y); - mask -= 1; - mask >>= 31; - mask = (uint)-mask; - return (byte)(mask & 0xFF); - } + t ^= d << (int)ctz_list[j]; + t ^= d << j; + } + if (usePadding) + { + Utils.Store8(tmp, 0, t); - private static void Layer(ushort[] p, byte[] output, int ptrIndex, int s, int n) - { - int i, j; - int stride = 1 << s; - int index = 0; - int d, m; + mat[i][block_idx + 8] = (byte)(((mat[i][block_idx + 8] & 0xff) >> tail << tail) | ((tmp[7] & 0xff) >> (8 - tail))); + mat[i][block_idx + 0] = (byte)(((tmp[0] & 0xff) << tail) | ((mat[i][block_idx] & 0xff) << (8 - tail) >> (8 - tail))); - for (i = 0; i < n; i += stride * 2) - { - for (j = 0; j < stride; j++) - { - d = p[i + j] ^ p[i + j + stride]; - m = (output[ptrIndex + (index >> 3)] >> (index & 7)) & 1; - m = -m; - d &= m; - p[i + j] ^= (ushort) d; - p[i + j + stride] ^= (ushort) d; - index++; + for (k = 7; k >= 1; k--) + { + mat[i][block_idx + k] = (byte)(((tmp[k] & 0xff) << tail) | ((tmp[k - 1] & 0xff) >> (8 - tail))); + } + } + else + { + Utils.Store8(mat[i], block_idx, t); + } } + + return 0; } - } - private static void ControlBitsFromPermutation(byte[] output, ushort[] pi, long w, long n) - { - int[] temp = new int[(int)(2 * n)]; - ushort[] pi_test = new ushort[(int)n]; - ushort diff; - int i; - int ptrIndex; - while (true) + /* return number of trailing zeros of the non-zero input in */ + private static int Ctz(ulong input) { - for (i = 0; i < (((2 * w - 1) * n / 2) + 7) / 8; i++) - { - output[i] = 0; - } - CBRecursion(output, 0, 1, pi, 0, w, n, temp); + int i, b, m = 0, r = 0; - // check for correctness - for (i = 0; i < n; i++) + for (i = 0; i < 64; i++) { - pi_test[i] = (ushort)i; + b = (int)((input >> i) & 1); + m |= b; + r += (m ^ 1) & (b ^ 1); } - ptrIndex = 0; - for (i = 0; i < w; i++) - { - Layer(pi_test, output, ptrIndex, i, (int)n); - ptrIndex += (int) n >> 4; - } + return r; + } - for (i = (int)(w - 2); i >= 0; i--) - { - Layer(pi_test, output, ptrIndex, i, (int)n); - ptrIndex += (int) n >> 4; - } + /* Used in mov columns*/ + static private ulong SameMask64(ushort x, ushort y) + { + ulong mask; - diff = 0; - for (i = 0; i < n; i++) - { - diff |= (ushort) (pi[i] ^ pi_test[i]); - } + mask = (ulong)(x ^ y); + mask -= 1; + mask >>= 63; + mask = (ulong)-(long)mask; // todo change with ~ - if (diff == 0) - { - break; - } + return mask; } - } - static short GetQShort(int[] temp, int q_index) - { - int temp_index = q_index / 2; - if (q_index % 2 == 0) - { - return (short)temp[temp_index]; - } - else + /* Used in error vector generation*/ + private static byte SameMask32(short x, short y) { - return (short)((temp[temp_index] & 0xffff0000) >> 16); - } - } - - static void CBRecursion(byte[] output, long pos, long step, ushort[] pi, int qIndex, long w, long n, int[] temp) - { - long x, i, j, k; + uint mask; - if (w == 1) - { - output[(int)(pos >> 3)] ^= (byte) (GetQShort(temp, qIndex) << (int)(pos & 7)); - return; + mask = (uint)(x ^ y); + mask -= 1; + mask >>= 31; + mask = (uint)-mask; + return (byte)(mask & 0xFF); } - if (pi != null) + private static void Layer(ushort[] p, byte[] output, int ptrIndex, int s, int n) { - for (x = 0; x < n; ++x) + int i, j; + int stride = 1 << s; + int index = 0; + int d, m; + + for (i = 0; i < n; i += stride * 2) { - temp[(int)x] = ((pi[(int)x] ^ 1) << 16) | pi[(int)(x ^ 1)]; + for (j = 0; j < stride; j++) + { + d = p[i + j] ^ p[i + j + stride]; + m = (output[ptrIndex + (index >> 3)] >> (index & 7)) & 1; + m = -m; + d &= m; + p[i + j] ^= (ushort)d; + p[i + j + stride] ^= (ushort)d; + index++; + } } } - else + + private static void ControlBitsFromPermutation(byte[] output, ushort[] pi, long w, long n) { - for (x = 0; x < n; ++x) + int[] temp = new int[(int)(2 * n)]; + ushort[] pi_test = new ushort[(int)n]; + ushort diff; + int i; + int ptrIndex; + while (true) { - temp[(int)x] = ((GetQShort(temp, (int)(qIndex + x)) ^ 1) << 16) | GetQShort(temp, (int)((qIndex) + (x ^ 1))); + for (i = 0; i < (((2 * w - 1) * n / 2) + 7) / 8; i++) + { + output[i] = 0; + } + CBRecursion(output, 0, 1, pi, 0, w, n, temp); + + // check for correctness + for (i = 0; i < n; i++) + { + pi_test[i] = (ushort)i; + } + + ptrIndex = 0; + for (i = 0; i < w; i++) + { + Layer(pi_test, output, ptrIndex, i, (int)n); + ptrIndex += (int)n >> 4; + } + + for (i = (int)(w - 2); i >= 0; i--) + { + Layer(pi_test, output, ptrIndex, i, (int)n); + ptrIndex += (int)n >> 4; + } + + diff = 0; + for (i = 0; i < n; i++) + { + diff |= (ushort)(pi[i] ^ pi_test[i]); + } + + if (diff == 0) + { + break; + } } } - Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar */ - for (x = 0; x < n; ++x) + static short GetQShort(int[] temp, int q_index) { - int Ax = temp[(int)x]; - int px = Ax & 0xffff; - int cx = px; - if (x < cx) + int temp_index = q_index / 2; + if (q_index % 2 == 0) { - cx = (int)x; + return (short)temp[temp_index]; + } + else + { + return (short)((temp[temp_index] & 0xffff0000) >> 16); } - temp[(int)(n + x)] = (px << 16) | cx; - } - - for (x = 0; x < n; ++x) - { - temp[(int)x] = (int)((temp[(int)x] << 16) | x); /* A = (pibar<<16)+id */ } - Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar^-1 */ - for (x = 0; x < n; ++x) + static void CBRecursion(byte[] output, long pos, long step, ushort[] pi, int qIndex, long w, long n, int[] temp) { - temp[(int)x] = (temp[(int)x] << 16) + (temp[(int)(n + x)] >> 16); /* A = (pibar^(-1)<<16)+pibar */ - } - Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar^2 */ + long x, i, j, k; - if (w <= 10) - { - for (x = 0; x < n; ++x) + if (w == 1) { - temp[(int)(n + x)] = ((temp[(int)x] & 0xffff) << 10) | (temp[(int)(n + x)] & 0x3ff); + output[(int)(pos >> 3)] ^= (byte)(GetQShort(temp, qIndex) << (int)(pos & 7)); + return; } - for (i = 1; i < w - 1; ++i) + if (pi != null) { - /* B = (p<<10)+c */ - for (x = 0; x < n; ++x) { - temp[(int)x] = (int)(((temp[(int)(n + x)] & ~0x3ff) << 6) | x); /* A = (p<<16)+id */ + temp[(int)x] = ((pi[(int)x] ^ 1) << 16) | pi[(int)(x ^ 1)]; } - Sort32(temp, 0, (int)n); /* A = (id<<16)+p^{-1} */ - + } + else + { for (x = 0; x < n; ++x) { - temp[(int)x] = (temp[(int)x] << 20) | temp[(int)(n + x)]; /* A = (p^{-1}<<20)+(p<<10)+c */ + temp[(int)x] = ((GetQShort(temp, (int)(qIndex + x)) ^ 1) << 16) | GetQShort(temp, (int)((qIndex) + (x ^ 1))); } - Sort32(temp, 0, (int)n); /* A = (id<<20)+(pp<<10)+cp */ + } + Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar */ + for (x = 0; x < n; ++x) + { + int Ax = temp[(int)x]; + int px = Ax & 0xffff; + int cx = px; + if (x < cx) + { + cx = (int)x; + } + temp[(int)(n + x)] = (px << 16) | cx; + } + + for (x = 0; x < n; ++x) + { + temp[(int)x] = (int)((temp[(int)x] << 16) | x); /* A = (pibar<<16)+id */ + } + Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar^-1 */ + + for (x = 0; x < n; ++x) + { + temp[(int)x] = (temp[(int)x] << 16) + (temp[(int)(n + x)] >> 16); /* A = (pibar^(-1)<<16)+pibar */ + } + Sort32(temp, 0, (int)n); /* A = (id<<16)+pibar^2 */ + + if (w <= 10) + { for (x = 0; x < n; ++x) { - int ppcpx = temp[(int)x] & 0xfffff; - int ppcx = (temp[(int)x] & 0xffc00) | (temp[(int)(n + x)] & 0x3ff); - if (ppcpx < ppcx) + temp[(int)(n + x)] = ((temp[(int)x] & 0xffff) << 10) | (temp[(int)(n + x)] & 0x3ff); + } + + for (i = 1; i < w - 1; ++i) + { + /* B = (p<<10)+c */ + + for (x = 0; x < n; ++x) + { + temp[(int)x] = (int)(((temp[(int)(n + x)] & ~0x3ff) << 6) | x); /* A = (p<<16)+id */ + } + Sort32(temp, 0, (int)n); /* A = (id<<16)+p^{-1} */ + + for (x = 0; x < n; ++x) + { + temp[(int)x] = (temp[(int)x] << 20) | temp[(int)(n + x)]; /* A = (p^{-1}<<20)+(p<<10)+c */ + } + Sort32(temp, 0, (int)n); /* A = (id<<20)+(pp<<10)+cp */ + + for (x = 0; x < n; ++x) { - ppcx = ppcpx; + int ppcpx = temp[(int)x] & 0xfffff; + int ppcx = (temp[(int)x] & 0xffc00) | (temp[(int)(n + x)] & 0x3ff); + if (ppcpx < ppcx) + { + ppcx = ppcpx; + } + temp[(int)(n + x)] = ppcx; } - temp[(int)(n + x)] = ppcx; } - } - for (x = 0; x < n; ++x) - { - temp[(int)(n + x)] &= 0x3ff; - } - } - else - { - for (x = 0; x < n; ++x) - { - temp[(int)(n + x)] = (temp[(int)x] << 16) | (temp[(int)(n + x)] & 0xffff); - } - for (i = 1; i < w - 1; ++i) - { - /* B = (p<<16)+c */ for (x = 0; x < n; ++x) { - temp[(int)x] = (int)((temp[(int)(n + x)] & ~0xffff) | x); + temp[(int)(n + x)] &= 0x3ff; } - Sort32(temp, 0, (int)n); /* A = (id<<16)+p^(-1) */ + } + else + { for (x = 0; x < n; ++x) { - temp[(int)x] = (temp[(int)x] << 16) | (temp[(int)(n + x)] & 0xffff); + temp[(int)(n + x)] = (temp[(int)x] << 16) | (temp[(int)(n + x)] & 0xffff); } - - /* A = p^(-1)<<16+c */ - if (i < w - 2) + for (i = 1; i < w - 1; ++i) { - //if loop 1 B + /* B = (p<<16)+c */ for (x = 0; x < n; ++x) { - temp[(int)(n + x)] = (temp[(int)x] & ~0xffff) | (temp[(int)(n + x)] >> 16); + temp[(int)x] = (int)((temp[(int)(n + x)] & ~0xffff) | x); } - /* B = (p^(-1)<<16)+p */ - - Sort32(temp, (int)n, (int)(n * 2)); /* B = (id<<16)+p^(-2) */ + Sort32(temp, 0, (int)n); /* A = (id<<16)+p^(-1) */ for (x = 0; x < n; ++x) { - temp[(int)(n + x)] = (temp[(int)(n + x)] << 16) | (temp[(int)x] & 0xffff); + temp[(int)x] = (temp[(int)x] << 16) | (temp[(int)(n + x)] & 0xffff); } - /* B = (p^(-2)<<16)+c */ - } + /* A = p^(-1)<<16+c */ + if (i < w - 2) + { + //if loop 1 B + for (x = 0; x < n; ++x) + { + temp[(int)(n + x)] = (temp[(int)x] & ~0xffff) | (temp[(int)(n + x)] >> 16); + } + /* B = (p^(-1)<<16)+p */ - Sort32(temp, 0, (int)n); - /* A = id<<16+cp */ - for (x = 0; x < n; ++x) - { - int cpx = (temp[(int)(n + x)] & ~0xffff) | (temp[(int)x] & 0xffff); - if (cpx < temp[(int)(n + x)]) + Sort32(temp, (int)n, (int)(n * 2)); /* B = (id<<16)+p^(-2) */ + for (x = 0; x < n; ++x) + { + temp[(int)(n + x)] = (temp[(int)(n + x)] << 16) | (temp[(int)x] & 0xffff); + } + /* B = (p^(-2)<<16)+c */ + } + + + Sort32(temp, 0, (int)n); + /* A = id<<16+cp */ + for (x = 0; x < n; ++x) { - temp[(int)(n + x)] = cpx; + int cpx = (temp[(int)(n + x)] & ~0xffff) | (temp[(int)x] & 0xffff); + if (cpx < temp[(int)(n + x)]) + { + temp[(int)(n + x)] = cpx; + } } } + for (x = 0; x < n; ++x) + { + temp[(int)(n + x)] &= 0xffff; + } } - for (x = 0; x < n; ++x) - { - temp[(int)(n + x)] &= 0xffff; - } - } - if (pi != null) - { - for (x = 0; x < n; ++x) + if (pi != null) { - temp[(int)x] = (int)((((int)pi[(int)x]) << 16) + x); + for (x = 0; x < n; ++x) + { + temp[(int)x] = (int)((((int)pi[(int)x]) << 16) + x); + } } - } - else - { - for (x = 0; x < n; ++x) + else { - temp[(int)x] = (int)(((GetQShort(temp, (int)(qIndex + x))) << 16) + x); + for (x = 0; x < n; ++x) + { + temp[(int)x] = (int)(((GetQShort(temp, (int)(qIndex + x))) << 16) + x); + } } - } - - Sort32(temp, 0, (int)n); /* A = (id<<16)+pi^(-1) */ - - for (j = 0; j < n / 2; ++j) - { - long _x = 2 * j; - int fj = temp[(int)(n + _x)] & 1; /* f[j] */ - int Fx = (int)(_x + fj); /* F[x] */ - int Fx1 = Fx ^ 1; /* F[x+1] */ - - output[(int)(pos >> 3)] ^= (byte) (fj << (int) (pos & 7)); - pos += step; - - temp[(int)(n + _x)] = (temp[(int)_x] << 16) | Fx; - temp[(int)(n + _x + 1)] = (temp[(int)(_x + 1)] << 16) | Fx1; - } - /* B = (pi^(-1)<<16)+F */ - - Sort32(temp, (int)n, (int)(n * 2)); /* B = (id<<16)+F(pi) */ - pos += (2 * w - 3) * step * (n / 2); + Sort32(temp, 0, (int)n); /* A = (id<<16)+pi^(-1) */ - for (k = 0; k < n / 2; ++k) - { - long y = 2 * k; - int lk = temp[(int)(n + y)] & 1; /* l[k] */ - int Ly = (int)(y + lk); /* L[y] */ - int Ly1 = Ly ^ 1; /* L[y+1] */ + for (j = 0; j < n / 2; ++j) + { + long _x = 2 * j; + int fj = temp[(int)(n + _x)] & 1; /* f[j] */ + int Fx = (int)(_x + fj); /* F[x] */ + int Fx1 = Fx ^ 1; /* F[x+1] */ - output[(int)(pos >> 3)] ^= (byte) (lk << (int) (pos & 7)); - pos += step; + output[(int)(pos >> 3)] ^= (byte)(fj << (int)(pos & 7)); + pos += step; - temp[(int)y] = (Ly << 16) | (temp[(int)(n + y)] & 0xffff); - temp[(int)(y + 1)] = (Ly1 << 16) | (temp[(int)(n + y + 1)] & 0xffff); - } - /* A = (L<<16)+F(pi) */ + temp[(int)(n + _x)] = (temp[(int)_x] << 16) | Fx; + temp[(int)(n + _x + 1)] = (temp[(int)(_x + 1)] << 16) | Fx1; + } + /* B = (pi^(-1)<<16)+F */ - Sort32(temp, 0, (int)n); /* A = (id<<16)+F(pi(L)) = (id<<16)+M */ + Sort32(temp, (int)n, (int)(n * 2)); /* B = (id<<16)+F(pi) */ - pos -= (2 * w - 2) * step * (n / 2); + pos += (2 * w - 3) * step * (n / 2); - short[] q = new short[(int)n * 4]; - for (i = 0/*n + n/4*/; i < n * 2; i++) - { - q[(int)(i * 2 + 0)] = (short)temp[(int)i]; - q[(int)(i * 2 + 1)] = (short)((temp[(int)i] & 0xffff0000) >> 16); - } - for (j = 0; j < n / 2; ++j) - { - q[(int)j] = (short)((temp[(int)(2 * j)] & 0xffff) >> 1); - q[(int)(j + n / 2)] = (short)((temp[(int)(2 * j + 1)] & 0xffff) >> 1); - } - for (i = 0; i < n / 2; i++) - { - temp[(int)(n + n / 4 + i)] = (((int)q[(int)(i * 2 + 1)]) << 16) | ((int)q[(int)(i * 2)]); - } - CBRecursion(output, pos, step * 2, null, (int)(n + n / 4) * 2, w - 1, n / 2, temp); - CBRecursion(output, pos + step, step * 2, null, (int)((n + n / 4) * 2 + n / 2), w - 1, n / 2, temp); - } + for (k = 0; k < n / 2; ++k) + { + long y = 2 * k; + int lk = temp[(int)(n + y)] & 1; /* l[k] */ + int Ly = (int)(y + lk); /* L[y] */ + int Ly1 = Ly ^ 1; /* L[y+1] */ - private int PKGen(byte[] pk, byte[] sk, uint[] perm, ushort[] pi, ulong[] pivots) - { - ushort[] g = new ushort[SYS_T + 1]; // Goppa polynomial - int i, j, k; - g[SYS_T] = 1; + output[(int)(pos >> 3)] ^= (byte)(lk << (int)(pos & 7)); + pos += step; - for (i = 0; i < SYS_T; i++) - { - g[i] = Utils.LoadGF(sk, 40 + i * 2, GFMASK); - } + temp[(int)y] = (Ly << 16) | (temp[(int)(n + y)] & 0xffff); + temp[(int)(y + 1)] = (Ly1 << 16) | (temp[(int)(n + y + 1)] & 0xffff); + } + /* A = (L<<16)+F(pi) */ - // Create buffer - long[] buf = new long[1 << GFBITS]; - for (i = 0; i < (1 << GFBITS); i++) - { - buf[i] = perm[i]; - buf[i] <<= 31; - buf[i] |= i; - // buf[i] &= 0x7fffffffffffffffL; // getting rid of signed longs - } - // Sort32 the buffer + Sort32(temp, 0, (int)n); /* A = (id<<16)+F(pi(L)) = (id<<16)+M */ - // FieldOrdering 2.4.2 - 3. Sort32 the pairs (ai,i) in lexicographic order to obtain pairs (aπ(i),π(i)) - // where π is a permutation of {0,1,...,q −1} - Sort64(buf, 0, buf.Length); + pos -= (2 * w - 2) * step * (n / 2); - // FieldOrdering 2.4.2 - 2. If a0,a1,...,aq−1 are not distinct, return ⊥. - for (i = 1; i < (1 << GFBITS); i++) - { - if ((buf[i - 1] >> 31) == (buf[i] >> 31)) + short[] q = new short[(int)n * 4]; + for (i = 0/*n + n/4*/; i < n * 2; i++) + { + q[(int)(i * 2 + 0)] = (short)temp[(int)i]; + q[(int)(i * 2 + 1)] = (short)((temp[(int)i] & 0xffff0000) >> 16); + } + for (j = 0; j < n / 2; ++j) + { + q[(int)j] = (short)((temp[(int)(2 * j)] & 0xffff) >> 1); + q[(int)(j + n / 2)] = (short)((temp[(int)(2 * j + 1)] & 0xffff) >> 1); + } + for (i = 0; i < n / 2; i++) { -// System.out.println("FAIL 1"); - return -1; + temp[(int)(n + n / 4 + i)] = (((int)q[(int)(i * 2 + 1)]) << 16) | ((int)q[(int)(i * 2)]); } + CBRecursion(output, pos, step * 2, null, (int)(n + n / 4) * 2, w - 1, n / 2, temp); + CBRecursion(output, pos + step, step * 2, null, (int)((n + n / 4) * 2 + n / 2), w - 1, n / 2, temp); } - // FieldOrdering 2.4.2 - 4. - ushort[] L = new ushort[SYS_N]; - for (i = 0; i < (1 << GFBITS); i++) - { - pi[i] = (ushort)(buf[i] & GFMASK); - } - for (i = 0; i < SYS_N; i++) + private int PKGen(byte[] pk, byte[] sk, uint[] perm, ushort[] pi, ulong[] pivots) { - L[i] = Utils.Bitrev(pi[i], GFBITS); - } + ushort[] g = new ushort[SYS_T + 1]; // Goppa polynomial + int i, j, k; + g[SYS_T] = 1; - // filling matrix - ushort[] inv = new ushort[SYS_N]; + for (i = 0; i < SYS_T; i++) + { + g[i] = Utils.LoadGF(sk, 40 + i * 2, GFMASK); + } - Root(inv, g, L); + // Create buffer + long[] buf = new long[1 << GFBITS]; + for (i = 0; i < (1 << GFBITS); i++) + { + buf[i] = perm[i]; + buf[i] <<= 31; + buf[i] |= i; + // buf[i] &= 0x7fffffffffffffffL; // getting rid of signed longs + } + // Sort32 the buffer - for (i = 0; i < SYS_N; i++) - { - inv[i] = gf.GFInv(inv[i]); - } - byte[][] mat = new byte[PK_NROWS][]; - byte b; - for (i = 0; i < PK_NROWS; i++) - { - mat[i] = new byte[(SYS_N / 8)]; - } + // FieldOrdering 2.4.2 - 3. Sort32 the pairs (ai,i) in lexicographic order to obtain pairs (aπ(i),π(i)) + // where π is a permutation of {0,1,...,q −1} + Sort64(buf, 0, buf.Length); - for (i = 0; i < SYS_T; i++) - { - for (j = 0; j < SYS_N; j += 8) + // FieldOrdering 2.4.2 - 2. If a0,a1,...,aq−1 are not distinct, return ⊥. + for (i = 1; i < (1 << GFBITS); i++) { - for (k = 0; k < GFBITS; k++) + if ((buf[i - 1] >> 31) == (buf[i] >> 31)) { - b = (byte) ((inv[j + 7] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 6] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 5] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 4] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 3] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 2] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 1] >> k) & 1); - b <<= 1; - b |= (byte) ((inv[j + 0] >> k) & 1); - - mat[i * GFBITS + k][j / 8] = b; + // System.out.println("FAIL 1"); + return -1; } } - for (j = 0; j < SYS_N; j++) + // FieldOrdering 2.4.2 - 4. + ushort[] L = new ushort[SYS_N]; + for (i = 0; i < (1 << GFBITS); i++) { - inv[j] = gf.GFMul(inv[j], L[j]); + pi[i] = (ushort)(buf[i] & GFMASK); + } + for (i = 0; i < SYS_N; i++) + { + L[i] = Utils.Bitrev(pi[i], GFBITS); } - } - // gaussian elimination - int row, c; - byte mask; - for (i = 0; i < (PK_NROWS + 7) / 8; i++) - { - for (j = 0; j < 8; j++) + // filling matrix + ushort[] inv = new ushort[SYS_N]; + + Root(inv, g, L); + + for (i = 0; i < SYS_N; i++) + { + inv[i] = gf.GFInv(inv[i]); + } + byte[][] mat = new byte[PK_NROWS][]; + byte b; + for (i = 0; i < PK_NROWS; i++) { - row = i * 8 + j; + mat[i] = new byte[(SYS_N / 8)]; + } - if (row >= PK_NROWS) + for (i = 0; i < SYS_T; i++) + { + for (j = 0; j < SYS_N; j += 8) { - break; + for (k = 0; k < GFBITS; k++) + { + b = (byte)((inv[j + 7] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 6] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 5] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 4] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 3] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 2] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 1] >> k) & 1); + b <<= 1; + b |= (byte)((inv[j + 0] >> k) & 1); + + mat[i * GFBITS + k][j / 8] = b; + } } - if (usePivots) + for (j = 0; j < SYS_N; j++) { - if (row == PK_NROWS - 32) - { - if (MovColumns(mat, pi, pivots) != 0) - { -// System.out.println("failed mov column!"); - return -1; - } - } + inv[j] = gf.GFMul(inv[j], L[j]); } + } - for (k = row + 1; k < PK_NROWS; k++) + // gaussian elimination + int row, c; + byte mask; + for (i = 0; i < (PK_NROWS + 7) / 8; i++) + { + for (j = 0; j < 8; j++) { - mask = (byte)(mat[row][i] ^ mat[k][i]); - mask >>= j; - mask &= 1; - mask = (byte)-mask; + row = i * 8 + j; - for (c = 0; c < SYS_N / 8; c++) + if (row >= PK_NROWS) { - mat[row][c] ^= (byte) (mat[k][c] & mask); + break; } - } - // 7. Compute (T,cn−k−μ+1,...,cn−k,Γ′) ← MatGen(Γ). If this fails, set δ ← δ′ and - // restart the algorithm. - if (((mat[row][i] >> j) & 1) == 0) // return if not systematic - { -// System.out.println("FAIL 2\n"); - return -1; - } - for (k = 0; k < PK_NROWS; k++) - { - if (k != row) + if (usePivots) + { + if (row == PK_NROWS - 32) + { + if (MovColumns(mat, pi, pivots) != 0) + { + // System.out.println("failed mov column!"); + return -1; + } + } + } + + for (k = row + 1; k < PK_NROWS; k++) { - mask = (byte)(mat[k][i] >> j); + mask = (byte)(mat[row][i] ^ mat[k][i]); + mask >>= j; mask &= 1; mask = (byte)-mask; for (c = 0; c < SYS_N / 8; c++) { - mat[k][c] ^= (byte) (mat[row][c] & mask); + mat[row][c] ^= (byte)(mat[k][c] & mask); + } + } + // 7. Compute (T,cn−k−μ+1,...,cn−k,Γ′) ← MatGen(Γ). If this fails, set δ ← δ′ and + // restart the algorithm. + if (((mat[row][i] >> j) & 1) == 0) // return if not systematic + { + // System.out.println("FAIL 2\n"); + return -1; + } + + for (k = 0; k < PK_NROWS; k++) + { + if (k != row) + { + mask = (byte)(mat[k][i] >> j); + mask &= 1; + mask = (byte)-mask; + for (c = 0; c < SYS_N / 8; c++) + { + mat[k][c] ^= (byte)(mat[row][c] & mask); + + } } } } } - } - // FieldOrdering 2.4.2 - 5. Output (α1,α2,...,αq) - if (pk != null) - { - if (usePadding) + // FieldOrdering 2.4.2 - 5. Output (α1,α2,...,αq) + if (pk != null) { - int tail, pk_index = 0; - tail = PK_NROWS % 8; - for (i = 0; i < PK_NROWS; i++) + if (usePadding) { - for (j = (PK_NROWS - 1) / 8; j < SYS_N / 8 - 1; j++) + int tail, pk_index = 0; + tail = PK_NROWS % 8; + for (i = 0; i < PK_NROWS; i++) { - pk[pk_index++] = (byte)(((mat[i][j] & 0xff) >> tail) | (mat[i][j + 1] << (8 - tail))); + for (j = (PK_NROWS - 1) / 8; j < SYS_N / 8 - 1; j++) + { + pk[pk_index++] = (byte)(((mat[i][j] & 0xff) >> tail) | (mat[i][j + 1] << (8 - tail))); + } + pk[pk_index++] = (byte)((mat[i][j] & 0xff) >> tail); } - pk[pk_index++] = (byte)((mat[i][j] & 0xff) >> tail); } - } - else - { - for (i = 0; i < PK_NROWS; i++) + else { - k = 0; - for (j = 0; j < (((SYS_N - PK_NROWS) + 7) / 8); j++) + for (i = 0; i < PK_NROWS; i++) { - pk[i * (((SYS_N - PK_NROWS) + 7) / 8) + k] = mat[i][j + PK_NROWS / 8]; - k++; + k = 0; + for (j = 0; j < (((SYS_N - PK_NROWS) + 7) / 8); j++) + { + pk[i * (((SYS_N - PK_NROWS) + 7) / 8) + k] = mat[i][j + PK_NROWS / 8]; + k++; + } } } } + return 0; } - return 0; - } - - private ushort Eval(ushort[] f, ushort a) - { - ushort r; - - r = f[SYS_T]; - for (int i = SYS_T - 1; i >= 0; i--) + private ushort Eval(ushort[] f, ushort a) { - r = gf.GFMul(r, a); - r = gf.GFAdd(r, f[i]); - } - - return r; - } + ushort r; - private void Root(ushort[] output, ushort[] f, ushort[] L) - { - for (int i = 0; i < SYS_N; i++) - { - output[i] = Eval(f, L[i]); - } - } + r = f[SYS_T]; - private int GenerateIrrPoly(ushort[] field) - { + for (int i = SYS_T - 1; i >= 0; i--) + { + r = gf.GFMul(r, a); + r = gf.GFAdd(r, f[i]); + } - // Irreducible 2.4.1 - 2. Define β = β0 + β1y + ···+ βt−1yt−1 ∈Fq[y]/F(y). - // generating poly - ushort[][] m = new ushort[SYS_T + 1][]; - for (int i = 0; i < SYS_T+1; i++) - { - m[i] = new ushort[SYS_T]; + return r; } - // filling matrix - m[0] = new ushort[SYS_T]; - m[0][0] = 1; - for (int i = 1; i < SYS_T; i++) - { - m[0][i] = 0; - } - Array.Copy(field, 0, m[1], 0, SYS_T); - - for (int j = 2; j <= SYS_T; j++) + private void Root(ushort[] output, ushort[] f, ushort[] L) { - GFMul(m[j], m[j - 1], field); + for (int i = 0; i < SYS_N; i++) + { + output[i] = Eval(f, L[i]); + } } - // Irreducible 2.4.1 - 3. Compute the minimal polynomial g of β over Fq. (By definition g is monic and irre- - // ducible, and g(β) = 0.) - - // gaussian - for (int j = 0; j < SYS_T; j++) + private int GenerateIrrPoly(ushort[] field) { - for (int k = j + 1; k < SYS_T; k++) + + // Irreducible 2.4.1 - 2. Define β = β0 + β1y + ···+ βt−1yt−1 ∈Fq[y]/F(y). + // generating poly + ushort[][] m = new ushort[SYS_T + 1][]; + for (int i = 0; i < SYS_T + 1; i++) { - ushort mask = gf.GFIsZero(m[j][j]); - for (int c = j; c < SYS_T + 1; c++) - { - ushort temp = (ushort)(m[c][j] ^ m[c][k] & mask); - m[c][j] = temp; - } + m[i] = new ushort[SYS_T]; } - // Irreducible 2.4.1 - 4. Return g if g has degree t. Otherwise return ⊥ - if (m[j][j] == 0) // return if not systematic + // filling matrix + m[0] = new ushort[SYS_T]; + m[0][0] = 1; + for (int i = 1; i < SYS_T; i++) { -// System.out.println("FAILED GENERATING IRR POLY"); - return -1; - + m[0][i] = 0; } + Array.Copy(field, 0, m[1], 0, SYS_T); - ushort inv = gf.GFInv(m[j][j]); - - for (int c = j; c < SYS_T + 1; c++) + for (int j = 2; j <= SYS_T; j++) { - m[c][j] = gf.GFMul(m[c][j], inv); + GFMul(m[j], m[j - 1], field); } - for (int k = 0; k < SYS_T; k++) + // Irreducible 2.4.1 - 3. Compute the minimal polynomial g of β over Fq. (By definition g is monic and irre- + // ducible, and g(β) = 0.) + + // gaussian + for (int j = 0; j < SYS_T; j++) { - if (k != j) + for (int k = j + 1; k < SYS_T; k++) { - ushort t = m[j][k]; - + ushort mask = gf.GFIsZero(m[j][j]); for (int c = j; c < SYS_T + 1; c++) { - m[c][k] ^= gf.GFMul(m[c][j], t); + ushort temp = (ushort)(m[c][j] ^ m[c][k] & mask); + m[c][j] = temp; } } - } - } - for (int i = 0; i < SYS_T; i++) - { - field[i] = m[SYS_T][i]; - } - return 0; - } - private void GFMul(ushort[] output, ushort[] left, ushort[] right) - { + // Irreducible 2.4.1 - 4. Return g if g has degree t. Otherwise return ⊥ + if (m[j][j] == 0) // return if not systematic + { + // System.out.println("FAILED GENERATING IRR POLY"); + return -1; - ushort[] prod = new ushort[SYS_T * 2 - 1]; - for (int i = 0; i < SYS_T * 2 - 1; i++) - { - prod[i] = 0; - } - for (int i = 0; i < SYS_T; i++) - { - for (int j = 0; j < SYS_T; j++) + } + + ushort inv = gf.GFInv(m[j][j]); + + for (int c = j; c < SYS_T + 1; c++) + { + m[c][j] = gf.GFMul(m[c][j], inv); + } + + for (int k = 0; k < SYS_T; k++) + { + if (k != j) + { + ushort t = m[j][k]; + + for (int c = j; c < SYS_T + 1; c++) + { + m[c][k] ^= gf.GFMul(m[c][j], t); + } + } + } + } + for (int i = 0; i < SYS_T; i++) { - ushort temp = gf.GFMul(left[i], right[j]); - prod[i + j] ^= temp; + field[i] = m[SYS_T][i]; } + return 0; } - for (int i = (SYS_T - 1) * 2; i >= SYS_T; i--) + private void GFMul(ushort[] output, ushort[] left, ushort[] right) { - foreach (int polyIndex in poly) + + ushort[] prod = new ushort[SYS_T * 2 - 1]; + for (int i = 0; i < SYS_T * 2 - 1; i++) { - if (polyIndex == 0 && GFBITS == 12) + prod[i] = 0; + } + for (int i = 0; i < SYS_T; i++) + { + for (int j = 0; j < SYS_T; j++) { - prod[i - SYS_T] ^= (gf.GFMul(prod[i], (ushort)2)); + ushort temp = gf.GFMul(left[i], right[j]); + prod[i + j] ^= temp; } - else + } + + for (int i = (SYS_T - 1) * 2; i >= SYS_T; i--) + { + foreach (int polyIndex in poly) { - prod[i - SYS_T + polyIndex] ^= prod[i]; + if (polyIndex == 0 && GFBITS == 12) + { + prod[i - SYS_T] ^= (gf.GFMul(prod[i], (ushort)2)); + } + else + { + prod[i - SYS_T + polyIndex] ^= prod[i]; + } } } - } - Array.Copy(prod, 0, output, 0, SYS_T); - for (int i = 0; i < SYS_T; i++) - { - output[i] = prod[i]; + Array.Copy(prod, 0, output, 0, SYS_T); + for (int i = 0; i < SYS_T; i++) + { + output[i] = prod[i]; + } } - } - - /* check if the padding bits of pk are all zero */ - int CheckPKPadding(byte[] pk) - { - byte b; - int i, ret; - b = 0; - for (i = 0; i < PK_NROWS; i++) + /* check if the padding bits of pk are all zero */ + int CheckPKPadding(byte[] pk) { - b |= pk[i * PK_ROW_BYTES + PK_ROW_BYTES - 1]; - } + byte b; + int i, ret; - b = (byte)((b & 0xff) >> (PK_NCOLS % 8)); - b -= 1; - b = (byte)((b & 0xff) >> 7); - ret = b; - - return ret - 1; - } + b = 0; + for (i = 0; i < PK_NROWS; i++) + { + b |= pk[i * PK_ROW_BYTES + PK_ROW_BYTES - 1]; + } - /* check if the padding bits of c are all zero */ - int CheckCPadding(byte[] c) - { - byte b; - int ret; + b = (byte)((b & 0xff) >> (PK_NCOLS % 8)); + b -= 1; + b = (byte)((b & 0xff) >> 7); + ret = b; - b = (byte)((c[SYND_BYTES - 1] & 0xff) >> (PK_NROWS % 8)); - b -= 1; - b = (byte)((b & 0xff) >> 7); - ret = b; + return ret - 1; + } - return ret - 1; - } + /* check if the padding bits of c are all zero */ + int CheckCPadding(byte[] c) + { + byte b; + int ret; + b = (byte)((c[SYND_BYTES - 1] & 0xff) >> (PK_NROWS % 8)); + b -= 1; + b = (byte)((b & 0xff) >> 7); + ret = b; + return ret - 1; + } - private static void Sort32(int[] temp, int from, int to) - { - int top,p,q,r,i; - int n = to - from; - if (n < 2) return; - top = 1; - while (top < n - top) top += top; - for (p = top;p > 0;p >>= 1) + private static void Sort32(int[] temp, int from, int to) { - for (i = 0;i < n - p;++i) + int top, p, q, r, i; + int n = to - from; + + if (n < 2) return; + top = 1; + while (top < n - top) top += top; + + for (p = top; p > 0; p >>= 1) { - if ((i & p) == 0) + for (i = 0; i < n - p; ++i) { - int ab = temp[from + i + p] ^ temp[from + i]; - int c = temp[from + i + p] - temp[from + i]; - c ^= ab & (c ^ temp[from + i + p]); - c >>= 31; - c &= ab; - temp[from + i] ^= c; - temp[from + i + p] ^= c; + if ((i & p) == 0) + { + int ab = temp[from + i + p] ^ temp[from + i]; + int c = temp[from + i + p] - temp[from + i]; + c ^= ab & (c ^ temp[from + i + p]); + c >>= 31; + c &= ab; + temp[from + i] ^= c; + temp[from + i + p] ^= c; + } } - } - i = 0; - for (q = top;q > p;q >>= 1) - { - for (;i < n - q;++i) + i = 0; + for (q = top; q > p; q >>= 1) { - if ((i & p) == 0) + for (; i < n - q; ++i) { - int a = temp[from + i + p]; - for (r = q;r > p;r >>= 1) + if ((i & p) == 0) { - int ab = temp[from + i + r] ^ a; - int c = temp[from + i + r] - a; - c ^= ab & (c ^ temp[from + i + r]); - c >>= 31; - c &= ab; - a ^= c; - temp[from + i + r] ^= c; + int a = temp[from + i + p]; + for (r = q; r > p; r >>= 1) + { + int ab = temp[from + i + r] ^ a; + int c = temp[from + i + r] - a; + c ^= ab & (c ^ temp[from + i + r]); + c >>= 31; + c &= ab; + a ^= c; + temp[from + i + r] ^= c; + } + temp[from + i + p] = a; } - temp[from + i + p] = a; } } } } - } - private static void Sort64(long[] temp, int from, int to) - { - int top,p,q,r,i; - int n = to - from; + private static void Sort64(long[] temp, int from, int to) + { + int top, p, q, r, i; + int n = to - from; - if (n < 2) return; - top = 1; - while (top < n - top) top += top; + if (n < 2) return; + top = 1; + while (top < n - top) top += top; - for (p = top;p > 0;p >>= 1) - { - for (i = 0;i < n - p;++i) + for (p = top; p > 0; p >>= 1) { - if ((i & p) == 0) + for (i = 0; i < n - p; ++i) { - long c = temp[from + i + p] - temp[from + i]; - c >>= 63; - // c = -c; - c &= temp[from + i] ^ temp[from + i + p]; - temp[from + i] ^= c; - temp[from + i + p] ^= c; + if ((i & p) == 0) + { + long c = temp[from + i + p] - temp[from + i]; + c >>= 63; + // c = -c; + c &= temp[from + i] ^ temp[from + i + p]; + temp[from + i] ^= c; + temp[from + i + p] ^= c; + } } - } - i = 0; - for (q = top;q > p;q >>= 1) - { - for (;i < n - q;++i) + i = 0; + for (q = top; q > p; q >>= 1) { - if ((i & p) == 0) + for (; i < n - q; ++i) { - long a = temp[from + i + p]; - for (r = q;r > p;r >>= 1) + if ((i & p) == 0) { - long c = temp[from + i + r] - a; - c >>= 63; - // c = -c; - c &= a ^ temp[from + i + r]; - a ^= c; - temp[from + i + r] ^= c; + long a = temp[from + i + p]; + for (r = q; r > p; r >>= 1) + { + long c = temp[from + i + r] - a; + c >>= 63; + // c = -c; + c &= a ^ temp[from + i + r]; + a ^= c; + temp[from + i + r] ^= c; + } + temp[from + i + p] = a; } - temp[from + i + p] = a; } } } - } + } } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/cmce/CmceKemExtractor.cs b/crypto/src/pqc/crypto/cmce/CmceKemExtractor.cs index 292aaafe6..9c4e84456 100644 --- a/crypto/src/pqc/crypto/cmce/CmceKemExtractor.cs +++ b/crypto/src/pqc/crypto/cmce/CmceKemExtractor.cs @@ -1,44 +1,47 @@ +using System; using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Pqc.Crypto.Cmce; -public class CmceKemExtractor - : IEncapsulatedSecretExtractor +namespace Org.BouncyCastle.Pqc.Crypto.Cmce { - private CmceEngine engine; + public class CmceKemExtractor + : IEncapsulatedSecretExtractor + { + private CmceEngine engine; - private CmceKeyParameters key; + private CmceKeyParameters key; - public CmceKemExtractor(CmcePrivateKeyParameters privParams) - { - this.key = privParams; - InitCipher(key.Parameters); - } - - private void InitCipher(CmceParameters param) - { - engine = param.Engine; - CmcePrivateKeyParameters privateParams = (CmcePrivateKeyParameters)key; - if(privateParams.PrivateKey.Length < engine.PrivateKeySize) + public CmceKemExtractor(CmcePrivateKeyParameters privParams) { - key = new CmcePrivateKeyParameters(privateParams.Parameters, engine.decompress_private_key(privateParams.PrivateKey)); + this.key = privParams; + InitCipher(key.Parameters); } - } - public byte[] ExtractSecret(byte[] encapsulation) - { - return ExtractSecret(encapsulation, engine.DefaultSessionKeySize); - } + private void InitCipher(CmceParameters param) + { + engine = param.Engine; + CmcePrivateKeyParameters privateParams = (CmcePrivateKeyParameters)key; + if (privateParams.PrivateKey.Length < engine.PrivateKeySize) + { + key = new CmcePrivateKeyParameters(privateParams.Parameters, engine.decompress_private_key(privateParams.PrivateKey)); + } + } - public byte[] ExtractSecret(byte[] encapsulation, int sessionKeySizeInBits) - { - byte[] session_key = new byte[sessionKeySizeInBits / 8]; - engine.kem_dec(session_key, encapsulation, ((CmcePrivateKeyParameters)key).PrivateKey); - return session_key; - } + public byte[] ExtractSecret(byte[] encapsulation) + { + return ExtractSecret(encapsulation, engine.DefaultSessionKeySize); + } - public int GetInputSize() - { - return engine.CipherTextSize; + public byte[] ExtractSecret(byte[] encapsulation, int sessionKeySizeInBits) + { + byte[] session_key = new byte[sessionKeySizeInBits / 8]; + engine.kem_dec(session_key, encapsulation, ((CmcePrivateKeyParameters)key).PrivateKey); + return session_key; + } + + public int GetInputSize() + { + return engine.CipherTextSize; + } } } diff --git a/crypto/src/pqc/crypto/cmce/CmceKemGenerator.cs b/crypto/src/pqc/crypto/cmce/CmceKemGenerator.cs index a3df648ff..f703fd23b 100644 --- a/crypto/src/pqc/crypto/cmce/CmceKemGenerator.cs +++ b/crypto/src/pqc/crypto/cmce/CmceKemGenerator.cs @@ -1,86 +1,89 @@ using System; + using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; -public class CmceKemGenerator - : IEncapsulatedSecretGenerator +namespace Org.BouncyCastle.Pqc.Crypto.Cmce { - // the source of randomness - private SecureRandom sr; - - public CmceKemGenerator(SecureRandom random) - { - this.sr = random; - } - - public ISecretWithEncapsulation GenerateEncapsulated(AsymmetricKeyParameter recipientKey) + public class CmceKemGenerator + : IEncapsulatedSecretGenerator { - CmcePublicKeyParameters key = (CmcePublicKeyParameters)recipientKey; - CmceEngine engine = key.Parameters.Engine; + // the source of randomness + private SecureRandom sr; - return GenerateEncapsulated(recipientKey, engine.DefaultSessionKeySize); - } - - public ISecretWithEncapsulation GenerateEncapsulated(AsymmetricKeyParameter recipientKey, int sessionKeySizeInBits) - { - CmcePublicKeyParameters key = (CmcePublicKeyParameters)recipientKey; - CmceEngine engine = key.Parameters.Engine; - byte[] cipher_text = new byte[engine.CipherTextSize]; - byte[] sessionKey = new byte[sessionKeySizeInBits / 8]; // document as 32 - l/8 - Section 2.5.2 - engine.kem_enc(cipher_text, sessionKey, key.PublicKey, sr); - return new SecretWithEncapsulationImpl(sessionKey, cipher_text); - } - - private class SecretWithEncapsulationImpl - : ISecretWithEncapsulation - { - private volatile bool hasBeenDestroyed = false; - - private byte[] sessionKey; - private byte[] cipher_text; - - public SecretWithEncapsulationImpl(byte[] sessionKey, byte[] cipher_text) + public CmceKemGenerator(SecureRandom random) { - this.sessionKey = sessionKey; - this.cipher_text = cipher_text; + this.sr = random; } - public byte[] GetSecret() + public ISecretWithEncapsulation GenerateEncapsulated(AsymmetricKeyParameter recipientKey) { - CheckDestroyed(); + CmcePublicKeyParameters key = (CmcePublicKeyParameters)recipientKey; + CmceEngine engine = key.Parameters.Engine; - return Arrays.Clone(sessionKey); + return GenerateEncapsulated(recipientKey, engine.DefaultSessionKeySize); } - public byte[] GetEncapsulation() + public ISecretWithEncapsulation GenerateEncapsulated(AsymmetricKeyParameter recipientKey, int sessionKeySizeInBits) { - CheckDestroyed(); - - return Arrays.Clone(cipher_text); + CmcePublicKeyParameters key = (CmcePublicKeyParameters)recipientKey; + CmceEngine engine = key.Parameters.Engine; + byte[] cipher_text = new byte[engine.CipherTextSize]; + byte[] sessionKey = new byte[sessionKeySizeInBits / 8]; // document as 32 - l/8 - Section 2.5.2 + engine.kem_enc(cipher_text, sessionKey, key.PublicKey, sr); + return new SecretWithEncapsulationImpl(sessionKey, cipher_text); } - public void Dispose() + private class SecretWithEncapsulationImpl + : ISecretWithEncapsulation { - if (!hasBeenDestroyed) + private volatile bool hasBeenDestroyed = false; + + private byte[] sessionKey; + private byte[] cipher_text; + + public SecretWithEncapsulationImpl(byte[] sessionKey, byte[] cipher_text) { - hasBeenDestroyed = true; - Arrays.Clear(sessionKey); - Arrays.Clear(cipher_text); + this.sessionKey = sessionKey; + this.cipher_text = cipher_text; } - } - public bool IsDestroyed() - { - return hasBeenDestroyed; - } + public byte[] GetSecret() + { + CheckDestroyed(); - void CheckDestroyed() - { - if (IsDestroyed()) + return Arrays.Clone(sessionKey); + } + + public byte[] GetEncapsulation() + { + CheckDestroyed(); + + return Arrays.Clone(cipher_text); + } + + public void Dispose() + { + if (!hasBeenDestroyed) + { + hasBeenDestroyed = true; + Arrays.Clear(sessionKey); + Arrays.Clear(cipher_text); + } + } + + public bool IsDestroyed() + { + return hasBeenDestroyed; + } + + void CheckDestroyed() { - throw new Exception("data has been destroyed"); + if (IsDestroyed()) + { + throw new Exception("data has been destroyed"); + } } } } diff --git a/crypto/src/pqc/crypto/cmce/CmceKeyGenerationParameters.cs b/crypto/src/pqc/crypto/cmce/CmceKeyGenerationParameters.cs index 2139c5660..a1507712e 100644 --- a/crypto/src/pqc/crypto/cmce/CmceKeyGenerationParameters.cs +++ b/crypto/src/pqc/crypto/cmce/CmceKeyGenerationParameters.cs @@ -1,3 +1,5 @@ +using System; + using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Security; @@ -18,4 +20,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce public CmceParameters Parameters => parameters; } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/cmce/CmceKeyPairGenerator.cs b/crypto/src/pqc/crypto/cmce/CmceKeyPairGenerator.cs index af9264e4f..911b1a6b0 100644 --- a/crypto/src/pqc/crypto/cmce/CmceKeyPairGenerator.cs +++ b/crypto/src/pqc/crypto/cmce/CmceKeyPairGenerator.cs @@ -1,14 +1,13 @@ +using System; + using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Security; -namespace Org.BouncyCastle.Pqc.Crypto +namespace Org.BouncyCastle.Pqc.Crypto.Cmce { - public class CmceKeyPairGenerator : IAsymmetricCipherKeyPairGenerator { - private CmceKeyGenerationParameters CmceParams; private int m; diff --git a/crypto/src/pqc/crypto/cmce/CmceKeyParameters.cs b/crypto/src/pqc/crypto/cmce/CmceKeyParameters.cs index 40fc6a9e5..861d518c6 100644 --- a/crypto/src/pqc/crypto/cmce/CmceKeyParameters.cs +++ b/crypto/src/pqc/crypto/cmce/CmceKeyParameters.cs @@ -1,8 +1,9 @@ +using System; + using Org.BouncyCastle.Crypto; namespace Org.BouncyCastle.Pqc.Crypto.Cmce { - public class CmceKeyParameters : AsymmetricKeyParameter { @@ -18,4 +19,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce public CmceParameters Parameters => parameters; } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/cmce/CmcePrivateKeyParameters.cs b/crypto/src/pqc/crypto/cmce/CmcePrivateKeyParameters.cs index f438fcd3a..a336295d5 100644 --- a/crypto/src/pqc/crypto/cmce/CmcePrivateKeyParameters.cs +++ b/crypto/src/pqc/crypto/cmce/CmcePrivateKeyParameters.cs @@ -1,4 +1,5 @@ using System; + using Org.BouncyCastle.Utilities; namespace Org.BouncyCastle.Pqc.Crypto.Cmce diff --git a/crypto/src/pqc/crypto/cmce/CmcePublicKeyParameters.cs b/crypto/src/pqc/crypto/cmce/CmcePublicKeyParameters.cs index 3c8c55dd9..333203226 100644 --- a/crypto/src/pqc/crypto/cmce/CmcePublicKeyParameters.cs +++ b/crypto/src/pqc/crypto/cmce/CmcePublicKeyParameters.cs @@ -1,3 +1,5 @@ +using System; + using Org.BouncyCastle.Utilities; namespace Org.BouncyCastle.Pqc.Crypto.Cmce @@ -20,4 +22,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce this.publicKey = Arrays.Clone(publicKey); } } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/cmce/GF.cs b/crypto/src/pqc/crypto/cmce/GF.cs index 03231346c..b0e9e7c5e 100644 --- a/crypto/src/pqc/crypto/cmce/GF.cs +++ b/crypto/src/pqc/crypto/cmce/GF.cs @@ -1,3 +1,5 @@ +using System; + namespace Org.BouncyCastle.Pqc.Crypto.Cmce { abstract class GF @@ -32,8 +34,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce internal abstract protected ushort GFInv(ushort input); } - - + class GF12 : GF { @@ -128,7 +129,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce } } - + class GF13 : GF { @@ -298,4 +299,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Cmce return GFFrac(den, ((ushort) 1)); } } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/frodo/FrodoEngine.cs b/crypto/src/pqc/crypto/frodo/FrodoEngine.cs index 607dbfaef..020f721ea 100644 --- a/crypto/src/pqc/crypto/frodo/FrodoEngine.cs +++ b/crypto/src/pqc/crypto/frodo/FrodoEngine.cs @@ -562,7 +562,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Frodo // 4. mu' = Frodo.Decode(M) byte[] muprime = Decode(M); - /// 5. Parse pk = seedA || b (done above) + // 5. Parse pk = seedA || b (done above) // 6. seedSE' || k' = SHAKE(pkh || mu', len_seedSE + len_k) (length in bits) byte[] seedSEprime_kprime = new byte[len_seedSE_bytes + len_k_bytes]; diff --git a/crypto/src/pqc/crypto/frodo/FrodoPublicKeyParameters.cs b/crypto/src/pqc/crypto/frodo/FrodoPublicKeyParameters.cs index 9dea87cdb..1b8c37331 100644 --- a/crypto/src/pqc/crypto/frodo/FrodoPublicKeyParameters.cs +++ b/crypto/src/pqc/crypto/frodo/FrodoPublicKeyParameters.cs @@ -1,3 +1,5 @@ +using System; + using Org.BouncyCastle.Utilities; namespace Org.BouncyCastle.Pqc.Crypto.Frodo @@ -5,10 +7,9 @@ namespace Org.BouncyCastle.Pqc.Crypto.Frodo public class FrodoPublicKeyParameters : FrodoKeyParameters { + private readonly byte[] m_publicKey; - public byte[] publicKey; - - public byte[] PublicKey => Arrays.Clone(publicKey); + public byte[] PublicKey => Arrays.Clone(m_publicKey); public byte[] GetEncoded() { @@ -18,7 +19,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Frodo public FrodoPublicKeyParameters(FrodoParameters parameters, byte[] publicKey) : base(false, parameters) { - this.publicKey = Arrays.Clone(publicKey); + m_publicKey = Arrays.Clone(publicKey); } } -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/lms/HSS.cs b/crypto/src/pqc/crypto/lms/HSS.cs index 295fbff28..8fc5dee3b 100644 --- a/crypto/src/pqc/crypto/lms/HSS.cs +++ b/crypto/src/pqc/crypto/lms/HSS.cs @@ -71,7 +71,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Lms /** * Increments an HSS private key without doing any work on it. * HSS private keys are automatically incremented when when used to create signatures. - *

+ *

* The HSS private key is ranged tested before this incrementation is applied. * LMS keys will be replaced as required. * diff --git a/crypto/src/pqc/crypto/lms/HSSSigner.cs b/crypto/src/pqc/crypto/lms/HSSSigner.cs index 3306853bf..9f361d20b 100644 --- a/crypto/src/pqc/crypto/lms/HSSSigner.cs +++ b/crypto/src/pqc/crypto/lms/HSSSigner.cs @@ -1,8 +1,7 @@ - using System; using System.IO; + using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.pqc.crypto; namespace Org.BouncyCastle.Pqc.Crypto.Lms { diff --git a/crypto/src/pqc/crypto/lms/LMSSigner.cs b/crypto/src/pqc/crypto/lms/LMSSigner.cs index d716a17a5..a5aebd312 100644 --- a/crypto/src/pqc/crypto/lms/LMSSigner.cs +++ b/crypto/src/pqc/crypto/lms/LMSSigner.cs @@ -1,7 +1,7 @@ using System; using System.IO; + using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.pqc.crypto; namespace Org.BouncyCastle.Pqc.Crypto.Lms { diff --git a/crypto/src/pqc/crypto/picnic/PicnicEngine.cs b/crypto/src/pqc/crypto/picnic/PicnicEngine.cs index fc60f19f0..57e3a005d 100644 --- a/crypto/src/pqc/crypto/picnic/PicnicEngine.cs +++ b/crypto/src/pqc/crypto/picnic/PicnicEngine.cs @@ -51,13 +51,13 @@ namespace Org.BouncyCastle.Pqc.Crypto.Picnic private static uint PICNIC_MAX_LOWMC_BLOCK_SIZE = 32; private static uint PICNIC_MAX_PUBLICKEY_SIZE = (2 * PICNIC_MAX_LOWMC_BLOCK_SIZE + 1); - /**< Largest serialized public key size, in bytes */ + /** Largest serialized public key size, in bytes */ private static uint PICNIC_MAX_PRIVATEKEY_SIZE = (3 * PICNIC_MAX_LOWMC_BLOCK_SIZE + 2); - /**< Largest serialized private key size, in bytes */ + /** Largest serialized private key size, in bytes */ private static uint PICNIC_MAX_SIGNATURE_SIZE = 209522; - /**< Largest signature size, in bytes */ + /** Largest signature size, in bytes */ private static uint TRANSFORM_FS = 0; diff --git a/crypto/src/pqc/crypto/picnic/PicnicSigner.cs b/crypto/src/pqc/crypto/picnic/PicnicSigner.cs index 840b68f59..302d144b3 100644 --- a/crypto/src/pqc/crypto/picnic/PicnicSigner.cs +++ b/crypto/src/pqc/crypto/picnic/PicnicSigner.cs @@ -1,5 +1,6 @@ +using System; + using Org.BouncyCastle.Crypto; -using Org.BouncyCastle.pqc.crypto; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; diff --git a/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusSigner.cs b/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusSigner.cs index f6260e692..7cbb9c1fb 100644 --- a/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusSigner.cs +++ b/crypto/src/pqc/crypto/sphincsplus/SPHINCSPlusSigner.cs @@ -1,7 +1,7 @@ using System; + using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Parameters; -using Org.BouncyCastle.pqc.crypto; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; -- cgit 1.4.1