From c6c5c065a5e41cc5cb0197debfdbbfe2870cdfc1 Mon Sep 17 00:00:00 2001
From: Nick Dunstone <49945179+nickdunstone13@users.noreply.github.com>
Date: Tue, 11 May 2021 12:04:15 +0100
Subject: [PATCH] ENT-6295: Upgrade to BC 1.68 on O/S 4.5 (#6906)

* Upgrade to BC 1.68 on O/S 4.5

* Added Ed25519 fix
---
 constants.properties                                            | 2 +-
 .../main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/constants.properties b/constants.properties
index fdc1a61211..ca2248617b 100644
--- a/constants.properties
+++ b/constants.properties
@@ -20,7 +20,7 @@ quasarClassifier=jdk8
 quasarVersion11=0.8.0_r3
 jdkClassifier11=jdk11
 proguardVersion=6.1.1
-bouncycastleVersion=1.66
+bouncycastleVersion=1.68
 classgraphVersion=4.8.90
 disruptorVersion=3.4.2
 typesafeConfigVersion=1.3.4
diff --git a/core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt b/core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt
index d065aa30e1..01e75a339b 100644
--- a/core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt
+++ b/core/src/main/kotlin/net/corda/core/crypto/internal/ProviderMap.kt
@@ -35,6 +35,7 @@ val cordaBouncyCastleProvider = BouncyCastleProvider().apply {
     putAll(EdDSASecurityProvider())
     // Override the normal EdDSA engine with one which can handle X509 keys.
     put("Signature.${EdDSAEngine.SIGNATURE_ALGORITHM}", X509EdDSAEngine::class.java.name)
+    put("Signature.Ed25519", X509EdDSAEngine::class.java.name)
     addKeyInfoConverter(`id-Curve25519ph`, object : AsymmetricKeyInfoConverter {
         override fun generatePublic(keyInfo: SubjectPublicKeyInfo) = decodePublicKey(EDDSA_ED25519_SHA512, keyInfo.encoded)
         override fun generatePrivate(keyInfo: PrivateKeyInfo) = decodePrivateKey(EDDSA_ED25519_SHA512, keyInfo.encoded)