Commit Graph

35 Commits

Author SHA1 Message Date
Andras Slemmer
66dd6afe2e Merge commit 'd072f6c275a5ff770aa66e37b9492a387d757329' into aslemmer-merge-19-Feb 2018-02-19 16:46:15 +00:00
Shams Asari
336aeb96e5 Merge fixes 2018-01-26 13:45:03 +00:00
Andras Slemmer
107fcf82e3 Fixing stuff 2017-12-18 15:39:08 +00:00
josecoll
79f288dcf6 Fix compilation errors on Tests following rebase from OS. 2017-12-18 14:30:46 +00:00
josecoll
4e42fff7d4 Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming) 2017-12-13 12:34:06 +00:00
josecoll
f357898e7a Fix compilation error following merge from ENT master 2017-12-13 09:28:54 +00:00
josecoll
2842205c30 Fix compilation error following merge from ENT master 2017-12-12 18:21:35 +00:00
Chris Rankin
58c9e6ae9e
Load correct serialisation scheme when debugging Enclavelet. (#119) 2017-11-22 08:39:34 +00:00
Chris Rankin
4dbd404f64
Integrate our deterministic OpenJDK fork with Avian (#117)
* Remove non-deterministic classes from Avian (wip).
* Complete integration between Avian and our local OpenJDK fork.
* Revert accidental Avian modification.
* Implements a "blacklist filter" for Avian's system classloader.
* Remove .DSA, .RSA, .SF and .MF files when creating a fat jar.
* Revert more accidental Avian changes.
* Fix breakage with dependencies, and retain Kryo instance.
* Apply blacklisting per thread rather than globally.
* Blacklist java.lang.ClassLoader and all java.lang.Thread* classes.
* Add comment explaining class blacklisting.
* Fix Avian when building without OpenJDK.
* Configure ProGuard to keep more classes for deserialisation.
* Retain explicit return type for secure random function.
* Add sources of random numbers to the class blacklist.
* Blacklist the threading classes more precisely.
* Make SystemClassLoader.isForbidden() static.
* Prevent ProGuard from removing SerializedLambda.readResolve().
* Remove Avian tests involving direct buffers.
2017-11-21 17:06:18 +00:00
Chris Rankin
9403e231cc Register Kryo and AMQP serialisation schemes for the SGX enclave. 2017-11-20 10:49:02 +00:00
josecoll
738067f673 Initialize serialization to fix failing test after merge from Open Source. 2017-11-19 19:09:14 +00:00
josecoll
70681cdcc7 Comment out unused code for now (uncompilable due to breaking open source code change) 2017-11-18 11:43:26 +00:00
Christian Sailer
8b55f415bd Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106 2017-11-06 17:37:30 +00:00
Christian Sailer
8549a77a76 Use system tmp dir instead of hardcoding unix path 2017-10-13 16:31:44 +01:00
sollecitom
3f5561db1e Fixed Enclavelet 2017-09-27 15:05:18 +01:00
sollecitom
85bc0a38a2 Trying to fix EnclaveletTest.kt
Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

EnclaveletTest passes.

Restored incorrectly removed function in TransactionDSLInterpreter.

Fixed NativeSgxApiTest
2017-09-27 12:04:18 +01:00
sollecitom
9284e731c0 Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26
# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
#	settings.gradle
2017-09-26 18:08:47 +01:00
Chris Rankin
a75dd409aa Remove component signature files from enclave's fat jar. (#34)
* Remove component signature files from enclave's fat jar.
* Create fat jar using everything in the runtime configuration.
2017-09-09 09:56:39 +01:00
Andras Slemmer
c9e9242ff4 Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-september-8 2017-09-08 11:14:40 +01:00
Chris Rankin
337e320275 Ensure that corda-enclavelet.jar is executable and works. (#33) 2017-09-06 17:32:08 +01:00
Chris Rankin
e075e52377 Update Gradle for verify-enclave project. (#30) 2017-08-31 08:19:20 +01:00
Andras Slemmer
a4ba8e4f2f Merge open master 2017-08-30 11:41:30 +01:00
Chris Rankin
e79da0ebae Ensure that the serialisation scheme is initialised as soon as the class is loaded. (#27) 2017-08-21 11:12:59 +01:00
Michal Kit
890ef68523 Fixes after rebase 2017-08-15 17:41:35 +01:00
Chris Rankin
3ae53683ea Register Kryo serializer for use inside the SGX enclave. (#23) 2017-08-15 12:05:32 +01:00
Michal Kit
b6fd5ede58 Merge community-master 2017-08-15 12:04:09 +01:00
Mike Hearn
291049f66e Fixup after merge 2017-08-01 16:13:37 +02:00
Mike Hearn
9df885c318 Merge remote-tracking branch 'origin/aslemmer-enterprise-merge-july-13' 2017-08-01 15:30:09 +02:00
Chris Rankin
4b3a804990 Build SGX against deterministic fork of OpenJDK8 (#16)
* Update SGX build to use deterministic OpenJDK repository.
* Remove unused imports.
* Update Kotlin dependencies.
* Update Avian so that it compiles against our OpenJDK repo.
Also include sunec.jar in the Avian binary. because the Enclavlet needs it.
* Embed jsse.jar within Avian to enable X.509 support.
2017-07-19 13:29:47 +01:00
Andras Slemmer
eac7db295c Merge remote-tracking branch 'open/master' into aslemmer-enterprise-merge-july-13 2017-07-13 12:35:20 +01:00
Andras Slemmer
4f85026dfc Merge remote-tracking branch 'open/master' 2017-06-27 14:45:30 +01:00
Mike Hearn
ca8f5050cf Merge branch 'master' into mike-enterprise-merge-june-20th 2017-06-21 19:49:33 +02:00
Andrius Dagys
376a9d399f Merge remote-tracking branch 'open/master' 2017-05-24 12:19:49 +01:00
Andrius Dagys
550be76787 Fix post-merge issues:
- Update Doorman to reflect the X500 naming and configuration changes
- Minor other changes
2017-05-11 17:56:32 +01:00
Andras Slemmer
528c9efe9d Add sgx build, documentation, verify-enclave 2017-03-24 18:23:04 +00:00