Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial support for elliptical curves #915

Merged
merged 37 commits into from
Nov 19, 2019
Merged

Initial support for elliptical curves #915

merged 37 commits into from
Nov 19, 2019

Commits on Nov 1, 2019

  1. Generate key pairs using encryptor rather than fixed values to

    enable tests for different encryptor implementations.
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    3a8a7bc View commit details
    Browse the repository at this point in the history
  2. ignore push test as fixtures are tricky to generate and this is covered

    in our send scenerios. Add todo comments to failure scenerios documentating 
     the danger of false positives.
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6c80eb7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    088dc82 View commit details
    Browse the repository at this point in the history
  4. Ensure that JACL encryptor is returned despite AEC being available in

    classloader. Temporary measure until config changes for alternative 
    encryptors is added. 
    
    Conflicts:
    	encryption/encryption-api/src/main/java/com/quorum/tessera/encryption/EncryptorFactory.java
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    03ec3eb View commit details
    Browse the repository at this point in the history
  5. Move payload build to be inner class to control and tighten up creation

    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
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    c75aea9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    812d318 View commit details
    Browse the repository at this point in the history
  7. Move config properties into root package to stop moxy generating

    unwanted namespaces.
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6472d9c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e9c3f1a View commit details
    Browse the repository at this point in the history
  9. Add type property to factories and filter on that. Allow optional

    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
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    8083f5a View commit details
    Browse the repository at this point in the history
  10. All code changes required to add alternative encryptor implementations,

    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
    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    d315079 View commit details
    Browse the repository at this point in the history
  11. remove commented code

    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    3bc9717 View commit details
    Browse the repository at this point in the history
  12. Rename aec to ec

    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    c138411 View commit details
    Browse the repository at this point in the history
  13. avoid null pointer

    melowe committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    0d1c323 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    60d28a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. Configuration menu
    Copy the full SHA
    0ee1c90 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Refactor config processing .

    Move password file generation out of config factory.
    melowe committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    533db80 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c1159a2 View commit details
    Browse the repository at this point in the history
  3. explicitly define passwords list as transient to prevent it

    being marshalled.
    melowe committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    5f74fea View commit details
    Browse the repository at this point in the history
  4. Don't store passwords to file system prefer to store in password list

    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.
    melowe committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    2ee0fbe View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Inject the encryptor into FileSystemKeyPair instead of InlineKeyPair

    Fix some acceptance tests
    namtruong committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    349fe62 View commit details
    Browse the repository at this point in the history
  2. Validate that updatepassword requires that the encrpytor type is defi…

    …ned.
    
    Keygen requires encrpytor type in config or as arg. 
    For normal running default encryptor to NACL
    melowe committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    888fa07 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4633556 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6ea53f3 View commit details
    Browse the repository at this point in the history
  5. Dont validate key presents after unmarshal as this is suppressed unless

    a key encryptor is present.
    melowe committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    05a41b5 View commit details
    Browse the repository at this point in the history
  6. Add encryptpr config to config object to deal with cases where not

    defined on original config file.
    melowe committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    79f178e View commit details
    Browse the repository at this point in the history
  7. dont sys out config

    melowe committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    56e8522 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9d926ff View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Configuration menu
    Copy the full SHA
    cf68cba View commit details
    Browse the repository at this point in the history
  2. Remove constructer that adds default encryptor as defaults are

    provided in too many locations.
    melowe committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    a63edeb View commit details
    Browse the repository at this point in the history
  3. Add hashcode and equals.

    melowe committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    318181a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c23bc07 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ab881d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Configuration menu
    Copy the full SHA
    7b0d659 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6da2153 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Configuration menu
    Copy the full SHA
    81ad2b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. Default encryptor type to NACL. Ensure that one of configfile, uddate…

    …password
    
    or keygen is defined on Cli.
    melowe committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    c5e8921 View commit details
    Browse the repository at this point in the history
  2. Set JSON_REDUCE_ANY_ARRAYS on marshaller to stop map marshal returning

    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.
    melowe committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    ee58618 View commit details
    Browse the repository at this point in the history