Initial support for elliptical curves #915
Merged
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
enable tests for different encryptor implementations.
in our send scenerios. Add todo comments to failure scenerios documentating the danger of false positives.
classloader. Temporary measure until config changes for alternative encryptors is added. Conflicts: encryption/encryption-api/src/main/java/com/quorum/tessera/encryption/EncryptorFactory.java
logic. Mock payloads in test in code module reducing cross impacts of any changes to encoding logic. Conflicts: enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/EnclaveImpl.java enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/EncodedPayload.java enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/EncodedPayloadBuilder.java enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/PayloadEncoderImpl.java enclave/enclave-api/src/test/java/com/quorum/tessera/enclave/EnclaveTest.java enclave/enclave-api/src/test/java/com/quorum/tessera/enclave/PayloadEncoderTest.java enclave/enclave-jaxrs/src/test/java/com/quorum/tessera/enclave/rest/Fixtures.java tessera-core/src/test/java/com/quorum/tessera/transaction/ResendManagerTest.java tessera-sync/src/test/java/com/quorum/tessera/sync/Fixtures.java
unwanted namespaces.
injection of properties as map for custom configuration when creating encryptors. Conflicts: encryption/encryption-api/src/main/java/com/quorum/tessera/encryption/EncryptorFactory.java encryption/encryption-api/src/test/java/com/quorum/tessera/encryption/MockEncryptorFactory.java encryption/encryption-jnacl/src/main/java/com/quorum/tessera/nacl/jnacl/JnaclFactory.java encryption/encryption-kalium/src/main/java/com/quorum/tessera/nacl/kalium/KaliumFactory.java
specifically elliptical curves. Changed test fixtures across project not to assume nacl. Conflicts: config-migration/src/main/java/com/quorum/tessera/config/builder/ConfigBuilder.java config/src/main/java/com/quorum/tessera/config/keypairs/InlineKeypair.java config/src/main/java/com/quorum/tessera/config/keys/KeyEncryptorFactory.java enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/EnclaveFactory.java encryption/encryption-api/src/test/java/com/quorum/tessera/encryption/EncryptorFactoryTest.java key-generation/src/main/java/com/quorum/tessera/key/generation/DefaultKeyGeneratorFactory.java key-generation/src/main/java/com/quorum/tessera/key/generation/FileKeyGenerator.java tests/acceptance-test/pom.xml tests/acceptance-test/src/test/java/com/quorum/tessera/test/P2pTestSuite.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/cli/keygen/FileKeygenSteps.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/grpc/GrpcSuite.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuite.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/RestSuiteSimple.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/SendWithRemoteEnclaveReconnectIT.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/rest/StressRestSuite.java tests/acceptance-test/src/test/java/com/quorum/tessera/test/ws/RestSuiteP2pWebsocketH2.java tests/acceptance-test/src/test/java/config/ConfigBuilder.java tests/acceptance-test/src/test/java/suite/ExecutionContext.java tests/acceptance-test/src/test/java/suite/ProcessConfig.java tests/acceptance-test/src/test/java/suite/ProcessConfiguration.java tests/acceptance-test/src/test/java/suite/TestSuite.java
Codecov Report
@@ Coverage Diff @@
## master #915 +/- ##
============================================
- Coverage 99.36% 99.33% -0.03%
- Complexity 2097 2159 +62
============================================
Files 319 327 +8
Lines 5792 6053 +261
Branches 310 333 +23
============================================
+ Hits 5755 6013 +258
Misses 5 5
- Partials 32 35 +3
Continue to review full report at Codecov.
|
|
KeyPair config requires refactoring . |
has config defined.
Move password file generation out of config factory.
being marshalled.
to be consumed by password resolver. Add tests to ensure that implicit protocol using absence or presence of passwords or passwordFile elements are still working as intended.
Fix some acceptance tests
…ned. Keygen requires encrpytor type in config or as arg. For normal running default encryptor to NACL
implementations.
a key encryptor is present.
defined on original config file.
melowe
requested review from
chris-j-h,
namtruong,
nicolae-leonte-go,
prd-fox and
SatpalSandhu61
as code owners
namtruong
reviewed
Nov 13, 2019
cli/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java
Outdated
Show resolved
Hide resolved
namtruong
reviewed
Nov 13, 2019
cli/config-cli/src/main/java/com/quorum/tessera/config/cli/DefaultCliAdapter.java
Outdated
Show resolved
Hide resolved
namtruong
reviewed
Nov 13, 2019
cli/config-cli/src/main/java/com/quorum/tessera/config/cli/parsers/EncryptorConfigParser.java
Outdated
Show resolved
Hide resolved
…password or keygen is defined on Cli.
an array of values. Add tests for marshal and unmarshal. Ensure that w3c element is also handled in xml adapter as unmarhsal receives a list of dom elements rather than jaxb elements.
namtruong
approved these changes
Nov 15, 2019
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.
Cli changes
tessera -updatepasswordrequires--encryptor.type=[NACL|EC]optiontessera -keygenrequires--encryptor.type=[NACL|EC]option or{encryptor : {type:NACL or EC }defining in confignormal usage default to NACL for backward compatibility.