Skip to content

Commit

Permalink
Merge branch 'main' into '1857-2-pgpkeyring-generator'
Browse files Browse the repository at this point in the history 
# Conflicts:
#   pg/src/test/java/org/bouncycastle/openpgp/test/RegressionTest.java
  • Loading branch information
@dghgit
dghgit committed Dec 11, 2024
2 parents e384c45 + a012951 commit 1aeb886
Show file tree
Hide file tree
Showing 62 changed files with 2,486 additions and 456 deletions.
44 changes: 31 additions & 13 deletions core/src/main/java/org/bouncycastle/crypto/engines/ElephantEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void init(boolean forEncryption, CipherParameters params)
this.getAlgorithmName(), 128, params, Utils.getPurpose(forEncryption)));
initialised = true;
m_state = forEncryption ? State.EncInit : State.DecInit;
inputMessage = new byte[BLOCK_SIZE + (forEncryption ? 0 : CRYPTO_ABYTES)];
inputMessage = new byte[BLOCK_SIZE * 2 + (forEncryption ? 0 : CRYPTO_ABYTES)];
reset(false);
}

Expand Down Expand Up @@ -372,12 +372,19 @@ public int processBytes(byte[] input, int inOff, int len, byte[] output, int out
int nb_it = Math.max(nblocks_c + 1, nblocks_ad - 1);
byte[] tempInput = new byte[Math.max(nblocks_c, 1) * BLOCK_SIZE];
System.arraycopy(inputMessage, 0, tempInput, 0, inputOff);
System.arraycopy(input, inOff, tempInput, inputOff, Math.min(len, tempInput.length));
System.arraycopy(input, inOff, tempInput, inputOff, Math.min(len, tempInput.length - inputOff));
int rv = processBytes(tempInput, output, outOff, nb_it, nblocks_m, nblocks_c, mlen, nblocks_ad, false);
int copyLen = rv - inputOff;
inputOff = inputOff + len - rv;
System.arraycopy(input, inOff + copyLen, inputMessage, 0, inputOff);

if (rv >= inputOff)
{
int copyLen = rv - inputOff;
inputOff = inputOff + len - rv;
System.arraycopy(input, inOff + copyLen, inputMessage, 0, inputOff);
}
else
{
System.arraycopy(input, inOff + rv, inputMessage, inputOff, len - rv);
inputOff += len - rv;
}
messageLen += rv;
return rv;
}
Expand All @@ -404,6 +411,7 @@ public int doFinal(byte[] output, int outOff)
throw new OutputLengthException("output buffer is too short");
}
int mlen = len + messageLen - (forEncryption ? 0 : CRYPTO_ABYTES);
int rv = mlen - messageLen;
int adlen = processAADBytes();
int nblocks_c = 1 + mlen / BLOCK_SIZE;
int nblocks_m = (mlen % BLOCK_SIZE) != 0 ? nblocks_c : nblocks_c - 1;
Expand All @@ -418,7 +426,7 @@ public int doFinal(byte[] output, int outOff)
{
System.arraycopy(tag_buffer, 0, tag, 0, CRYPTO_ABYTES);
System.arraycopy(tag, 0, output, outOff, tag.length);
mlen += CRYPTO_ABYTES;
rv += CRYPTO_ABYTES;
}
else
{
Expand All @@ -432,7 +440,7 @@ public int doFinal(byte[] output, int outOff)
}
}
reset(false);
return mlen;
return rv;
}

@Override
Expand All @@ -454,7 +462,17 @@ public int getUpdateOutputSize(int len)
case EncAad:
case EncData:
case EncInit:
return inputOff + len + CRYPTO_ABYTES;
{
int total = inputOff + len;
return total - total % BLOCK_SIZE;
}
case DecAad:
case DecData:
case DecInit:
{
int total = Math.max(0, inputOff + len - CRYPTO_ABYTES);
return total - total % BLOCK_SIZE;
}
}
return Math.max(0, len + inputOff - CRYPTO_ABYTES);
}
Expand All @@ -472,9 +490,9 @@ public int getOutputSize(int len)
case EncAad:
case EncData:
case EncInit:
return len + CRYPTO_ABYTES;
return len + inputOff + CRYPTO_ABYTES;
}
return Math.max(0, len - CRYPTO_ABYTES);
return Math.max(0, len + inputOff - CRYPTO_ABYTES);
}

@Override
Expand Down Expand Up @@ -523,7 +541,7 @@ public int getIVBytesSize()

public int getBlockSize()
{
return CRYPTO_ABYTES;
return BLOCK_SIZE;
}

private void checkAad()
Expand Down Expand Up @@ -621,7 +639,7 @@ private int processBytes(byte[] m, byte[] output, int outOff, int nb_it, int nbl
for (i = nb_its; i < nb_it; ++i)
{
int r_size = (i == nblocks_m - 1) ? mlen - i * BLOCK_SIZE : BLOCK_SIZE;
if (!isDofinal && (r_size % BLOCK_SIZE != 0 || mlen <= i * BLOCK_SIZE))
if (!isDofinal && (mlen <= i * BLOCK_SIZE || r_size % BLOCK_SIZE != 0))
{
break;
}
Expand Down
7 changes: 4 additions & 3 deletions core/src/main/java/org/bouncycastle/crypto/engines/ISAPEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ public void init(boolean forEncryption, CipherParameters params)
if (iv == null || iv.length != 16)
{
throw new IllegalArgumentException(
"ISAP AEAD requires exactly 12 bytes of IV");
"ISAP AEAD requires exactly 16 bytes of IV");
}

if (!(ivParams.getParameters() instanceof KeyParameter))
Expand Down Expand Up @@ -961,13 +961,14 @@ public byte[] getMac()
@Override
public int getUpdateOutputSize(int len)
{
return len;
int total = Math.max(0, len + message.size() + (forEncryption ? 0 : -16));
return total - total % ISAP_rH_SZ;
}

@Override
public int getOutputSize(int len)
{
return len + 16;
return Math.max(0, len + message.size() + (forEncryption ? 16 : -16));
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions core/src/main/java/org/bouncycastle/crypto/engines/PhotonBeetleEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,14 @@ public byte[] getMac()
@Override
public int getUpdateOutputSize(int len)
{
return len;
int total = Math.max(0, len + message.size() + (forEncryption ? 0 : -TAG_INBYTES));
return total - total % RATE_INBYTES;
}

@Override
public int getOutputSize(int len)
{
return len + TAG_INBYTES;
return Math.max(0, len + message.size() + (forEncryption ? TAG_INBYTES : -TAG_INBYTES));
}

@Override
Expand Down
13 changes: 7 additions & 6 deletions core/src/main/java/org/bouncycastle/crypto/engines/XoodyakEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class XoodyakEngine
private byte[] iv;
private final int PhaseDown = 1;
private final int PhaseUp = 2;
// private final int NLANES = 12;
// private final int NLANES = 12;
// private final int NROWS = 3;
// private final int NCOLUMS = 4;
private final int MAXROUNDS = 12;
Expand Down Expand Up @@ -262,13 +262,14 @@ public byte[] getMac()
@Override
public int getUpdateOutputSize(int len)
{
return len;
int total = Math.max(0, len + message.size() + (forEncryption ? 0 : -TAGLEN));
return total - total % Rkout;
}

@Override
public int getOutputSize(int len)
{
return len + TAGLEN;
return Math.max(0, len + message.size() + (forEncryption ? TAGLEN : -TAGLEN));
}

@Override
Expand Down Expand Up @@ -371,7 +372,7 @@ private void Up(byte[] Yi, int YiLen, int Cu)
a3 ^= e3;
a7 ^= e3;
a11 ^= e3;

/* Rho-west: plane shift */
int b0 = a0;
int b1 = a1;
Expand All @@ -390,7 +391,7 @@ private void Up(byte[] Yi, int YiLen, int Cu)

/* Iota: round ant */
b0 ^= RC[i];

/* Chi: non linear layer */
a0 = b0 ^ (~b4 & b8);
a1 = b1 ^ (~b5 & b9);
Expand All @@ -406,7 +407,7 @@ private void Up(byte[] Yi, int YiLen, int Cu)
b9 ^= (~b1 & b5);
b10 ^= (~b2 & b6);
b11 ^= (~b3 & b7);

/* Rho-east: plane shift */
a4 = Integers.rotateLeft(a4, 1);
a5 = Integers.rotateLeft(a5, 1);
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/bouncycastle/pqc/crypto/lms/LMSigParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public ASN1ObjectIdentifier getDigestOID()
return digestOid;
}

static LMSigParameters getParametersForType(int type)
public static LMSigParameters getParametersForType(int type)
{
return paramBuilders.get(type);
}
Expand Down
4 changes: 0 additions & 4 deletions core/src/main/java/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,6 @@ AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Obje
private LMSKeyParameters getLmsKeyParameters(byte[] keyEnc)
throws IOException
{
if (keyEnc.length == 64)
{
keyEnc = Arrays.copyOfRange(keyEnc, 4, keyEnc.length);
}
return HSSPublicKeyParameters.getInstance(keyEnc);
}
}
Expand Down
54 changes: 54 additions & 0 deletions core/src/test/java/org/bouncycastle/crypto/test/CipherTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.bouncycastle.crypto.params.ParametersWithIV;
import org.bouncycastle.util.Arrays;
import org.bouncycastle.util.test.SimpleTest;
import org.junit.Assert;

public abstract class CipherTest
extends SimpleTest
Expand Down Expand Up @@ -185,4 +186,57 @@ static void checkCipher(int aeadLen, int ivLen, int msgLen, int strength, Instac
throw new RuntimeException(e);
}
}

static void checkAEADCipherOutputSize(int keySize, int ivSize, int blockSize, int tagSize, AEADCipher cipher)
throws InvalidCipherTextException
{
final SecureRandom random = new SecureRandom();
int tmpLength = random.nextInt(blockSize - 1) + 1;
final byte[] plaintext = new byte[blockSize * 2 + tmpLength];
byte[] key = new byte[keySize];
byte[] iv = new byte[ivSize];
random.nextBytes(key);
random.nextBytes(iv);
random.nextBytes(plaintext);
cipher.init(true, new ParametersWithIV(new KeyParameter(key), iv));
byte[] ciphertext = new byte[cipher.getOutputSize(plaintext.length)];
//before the encrypt
Assert.assertEquals(plaintext.length + tagSize, ciphertext.length);
Assert.assertEquals(plaintext.length, cipher.getUpdateOutputSize(plaintext.length) + tmpLength);
//during the encrypt process of the first block
int len = cipher.processBytes(plaintext, 0, tmpLength, ciphertext, 0);
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(plaintext.length - tmpLength));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(plaintext.length - tmpLength) + tmpLength);
//during the encrypt process of the second block
len += cipher.processBytes(plaintext, tmpLength, blockSize, ciphertext, len);
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(plaintext.length - tmpLength - blockSize));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(plaintext.length - tmpLength - blockSize) + tmpLength);
//process the remaining bytes
len += cipher.processBytes(plaintext, tmpLength + blockSize, blockSize, ciphertext, len);
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(0));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(0) + tmpLength);
//process doFinal
len += cipher.doFinal(ciphertext, len);
Assert.assertEquals(len, ciphertext.length);

cipher.init(false, new ParametersWithIV(new KeyParameter(key), iv));
//before the encrypt
Assert.assertEquals(plaintext.length, cipher.getOutputSize(ciphertext.length));
Assert.assertEquals(plaintext.length, cipher.getUpdateOutputSize(ciphertext.length) + tmpLength);
//during the encrypt process of the first block
len = cipher.processBytes(ciphertext, 0, tmpLength, plaintext, 0);
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(ciphertext.length - tmpLength));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(ciphertext.length - tmpLength) + tmpLength);
//during the encrypt process of the second block
len += cipher.processBytes(ciphertext, tmpLength, blockSize, plaintext, len);
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(ciphertext.length - tmpLength - blockSize));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(ciphertext.length - tmpLength - blockSize) + tmpLength);
//process the remaining bytes
len += cipher.processBytes(ciphertext, tmpLength + blockSize, blockSize + tagSize, plaintext, len);
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(0));
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(0) + tmpLength);
//process doFinal
len += cipher.doFinal(plaintext, len);
Assert.assertEquals(len, plaintext.length);
}
}
14 changes: 8 additions & 6 deletions core/src/test/java/org/bouncycastle/crypto/test/ElephantTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ public String getName()
public void performTest()
throws Exception
{
//testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
CipherTest.checkAEADCipherOutputSize(16, 12, 20, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant160));
CipherTest.checkAEADCipherOutputSize(16, 12, 22, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant176));
CipherTest.checkAEADCipherOutputSize(16, 12, 25, 16, new ElephantEngine(ElephantEngine.ElephantParameters.elephant200));
// //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
testParameters(elephant, 16, 12, 16);
CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()
{
@Override
Expand Down Expand Up @@ -57,9 +63,6 @@ public AEADCipher CreateInstace()
testVectors(ElephantEngine.ElephantParameters.elephant160, "v160");
testVectors(ElephantEngine.ElephantParameters.elephant176, "v176");

ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
testParameters(elephant, 16, 12, 16);

elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant160);
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
Expand Down Expand Up @@ -233,6 +236,7 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
}

aeadBlockCipher.init(true, params);
c1 = new byte[aeadBlockCipher.getOutputSize(0)];
try
{
aeadBlockCipher.doFinal(c1, m.length);
Expand Down Expand Up @@ -442,7 +446,5 @@ public static void main(String[] args)
{
runTest(new ElephantTest());
}


}

8 changes: 7 additions & 1 deletion core/src/test/java/org/bouncycastle/crypto/test/ISAPTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ public void performTest()
testVectors("isapk128av20", IsapType.ISAP_K_128A);
testVectors("isapk128v20", IsapType.ISAP_K_128);
testVectors();
CipherTest.checkAEADCipherOutputSize(16, 16, 18, 16, new ISAPEngine(IsapType.ISAP_K_128A));
CipherTest.checkAEADCipherOutputSize(16, 16, 18, 16, new ISAPEngine(IsapType.ISAP_K_128));
CipherTest.checkAEADCipherOutputSize(16, 16, 8, 16, new ISAPEngine(IsapType.ISAP_A_128A));
CipherTest.checkAEADCipherOutputSize(16, 16, 8, 16, new ISAPEngine(IsapType.ISAP_A_128));
}

private void testVectors(String filename, IsapType isapType)
Expand Down Expand Up @@ -282,6 +286,7 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
}

aeadBlockCipher.init(true, params);
c1 = new byte[aeadBlockCipher.getOutputSize(m.length)];
try
{
aeadBlockCipher.doFinal(c1, m.length);
Expand Down Expand Up @@ -431,10 +436,11 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
{
m7[i] = (byte)rand.nextInt();
}

aeadBlockCipher.init(true, params);
byte[] c7 = new byte[aeadBlockCipher.getOutputSize(m7.length)];
byte[] c8 = new byte[c7.length];
byte[] c9 = new byte[c7.length];
aeadBlockCipher.init(true, params);
aeadBlockCipher.processAADBytes(aad2, 0, aad2.length);
offset = aeadBlockCipher.processBytes(m7, 0, m7.length, c7, 0);
aeadBlockCipher.doFinal(c7, offset);
Expand Down
5 changes: 4 additions & 1 deletion core/src/test/java/org/bouncycastle/crypto/test/PhotonBeetleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ public void performTest()
testVectors(PhotonBeetleEngine.PhotonBeetleParameters.pb32, "v32");
testVectors(PhotonBeetleEngine.PhotonBeetleParameters.pb128, "v128");
testExceptions(new PhotonBeetleDigest(), 32);
CipherTest.checkAEADCipherOutputSize(16, 16, 16, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb128));
CipherTest.checkAEADCipherOutputSize(16, 16, 4, 16, new PhotonBeetleEngine(PhotonBeetleEngine.PhotonBeetleParameters.pb32));
}

private void testVectorsHash()
Expand Down Expand Up @@ -228,6 +230,7 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
}

aeadBlockCipher.init(true, params);
c1 = new byte[aeadBlockCipher.getOutputSize(m.length)];
try
{
aeadBlockCipher.doFinal(c1, m.length);
Expand Down Expand Up @@ -379,10 +382,10 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
{
m7[i] = (byte)rand.nextInt();
}
aeadBlockCipher.init(true, params);
byte[] c7 = new byte[aeadBlockCipher.getOutputSize(m7.length)];
byte[] c8 = new byte[c7.length];
byte[] c9 = new byte[c7.length];
aeadBlockCipher.init(true, params);
aeadBlockCipher.processAADBytes(aad2, 0, aad2.length);
offset = aeadBlockCipher.processBytes(m7, 0, m7.length, c7, 0);
aeadBlockCipher.doFinal(c7, offset);
Expand Down
Loading

0 comments on commit 1aeb886

Please sign in to comment.