Skip to content

Commit 8f2fbfd

Browse files
author
gefeili
committed
Fix the issue in Grain128, for the output bit s94 instead of s95.
1 parent 8d339ef commit 8f2fbfd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/main/java/org/bouncycastle/crypto/engines/Grain128Engine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private int getOutput()
188188
int s60 = lfsr[1] >>> 28 | lfsr[2] << 4;
189189
int s79 = lfsr[2] >>> 15 | lfsr[3] << 17;
190190
int s93 = lfsr[2] >>> 29 | lfsr[3] << 3;
191-
int s94 = lfsr[2] >>> 31 | lfsr[3] << 1;
191+
int s94 = lfsr[2] >>> 30 | lfsr[3] << 2;
192192

193193
return b12 & s8 ^ s13 & s20 ^ b95 & s42 ^ s60 & s79 ^ b12 & b95 & s94 ^ s93
194194
^ b2 ^ b15 ^ b36 ^ b45 ^ b64 ^ b73 ^ b89;

core/src/test/java/org/bouncycastle/crypto/test/Grain128Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public class Grain128Test
1515
extends SimpleTest
1616
{
1717

18-
String keyStream1 = "f09b7bf7d7f6b5c2de2ffc73ac21397f";
19-
String keyStream2 = "afb5babfa8de896b4b9c6acaf7c4fbfd";
18+
String keyStream1 = "4bdb20824c5dce6fc63e94456c3281d4";
19+
String keyStream2 = "ba399daf90df8eba103d9ea83c805904";
2020

2121
public String getName()
2222
{

0 commit comments

Comments
 (0)