Remove use of BouncyCastle for EC key generation and point (de)compression #129
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
*Issue #, if available:* #41 *Description of changes:* Removes explicit use of BouncyCastle from the `ECDSASignatureAlgorithm` implementation of `TrailingSignatureAlgorithm`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. # Check any applicable: - [ ] Were any files moved? Moving files changes their URL, which breaks all hyperlinks to the files.
WesleyRosenblum
changed the title
SalusaSecondus
suggested changes
Oct 15, 2019
| import java.math.BigInteger; | ||
| import java.security.*; | ||
| import java.security.interfaces.ECPublicKey; | ||
| import java.security.spec.*; |
There was a problem hiding this comment.
No import stars please.
There was a problem hiding this comment.
Fixed, and updated my IDE
| import static com.amazonaws.encryptionsdk.internal.BouncyCastleConfiguration.INTERNAL_BOUNCY_CASTLE_PROVIDER; | ||
| import static com.amazonaws.encryptionsdk.internal.Utils.bigIntegerToByteArray; | ||
| import static com.amazonaws.encryptionsdk.internal.Utils.encodeBase64String; | ||
| import static org.apache.commons.lang3.Validate.*; |
There was a problem hiding this comment.
Ditto on import star.
| throw new IllegalArgumentException("Compressed y value was invalid"); | ||
| } | ||
|
|
||
| final BigInteger p = ((ECFieldFp)ecParameterSpec.getCurve().getField()).getP(); |
There was a problem hiding this comment.
Here and throughout: Please have a space between the closing parenthesis of the cast and the following token.
src/main/java/com/amazonaws/encryptionsdk/internal/TrailingSignatureAlgorithm.java
Show resolved
Hide resolved
Comment on lines
292
to
308
| final byte[] result = new byte[length]; | ||
| byte[] rawBytes = bigInteger.toByteArray(); | ||
|
|
||
| //Remove sign byte if one is present | ||
| if(rawBytes[0] == 0) { | ||
| rawBytes = Arrays.copyOfRange(rawBytes, 1, rawBytes.length); | ||
| } | ||
|
|
||
| if(length < rawBytes.length) { | ||
| throw new IllegalArgumentException("Length must be as least as long as the BigInteger byte array " + | ||
| "without the sign byte"); | ||
| } | ||
|
|
||
| System.arraycopy(rawBytes, 0, result, length - rawBytes.length, rawBytes.length); | ||
|
|
||
| return result; | ||
| } |
There was a problem hiding this comment.
Let's simplify this (and reduce unneeded allocations).
final byte[] rawBytes = bigInteger.toByteArray();
// If we're already the correct length, just return it.
if (rawBytes.length ==length) {
return rawBytes;
}
// If we're exactly one byte too large, but we have a leading zero byte, remove it and return.
if (rawBytes.length == length + 1 && rawBytes[0] == 0) {
return Arrays.copyOfRange(rawBytes, 1, rawBytes.length);
}
if (rawBytes.length > length) {
throw new IllegalArgumentException("Length must be as least as long as the BigInteger byte array " +
"without the sign byte");
}
final byte[] paddedResult = new byte[length];
System.arraycopy(rawBytes, 0, paddedResult , length - rawBytes.length, rawBytes.length);
return paddedResult;
}
| public static byte[] unsignedBytesToSignedBytes(final int[] unsignedBytes) { | ||
| byte[] signedBytes = new byte[unsignedBytes.length]; | ||
|
|
||
| for(int i= 0 ; i < unsignedBytes.length; i++) { |
There was a problem hiding this comment.
Here and throughout: space after if, for, and other keywords to distinguish them from function calls.
Here: Space on either side of the equals.
| @@ -96,5 +97,19 @@ public void base64something() { | |||
| assertEquals(encoded, Utils.encodeBase64String(data)); | |||
| assertArrayEquals(data, Utils.decodeBase64String(encoded)); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testBigIntegerToByteArray() { | |||
There was a problem hiding this comment.
Please also test exceptional cases.
There was a problem hiding this comment.
Added tests
*Issue #, if available:* #41 *Description of changes:* Removes explicit use of BouncyCastle from the `ECDSASignatureAlgorithm` implementation of `TrailingSignatureAlgorithm`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. # Check any applicable: - [ ] Were any files moved? Moving files changes their URL, which breaks all hyperlinks to the files.
into pull/41 � Conflicts: � src/main/java/com/amazonaws/encryptionsdk/internal/TrailingSignatureAlgorithm.java � src/main/java/com/amazonaws/encryptionsdk/internal/Utils.java � src/test/java/com/amazonaws/encryptionsdk/TestUtils.java � src/test/java/com/amazonaws/encryptionsdk/UtilsTest.java � src/test/java/com/amazonaws/encryptionsdk/internal/TrailingSignatureAlgorithmTest.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available: #41
Description of changes:
Removes explicit use of BouncyCastle from the
ECDSASignatureAlgorithmimplementation ofTrailingSignatureAlgorithm.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Check any applicable: