Skip to content

Commit

Permalink
Merge pull request #407 from KostasTsiounis/fix_trace
Browse files Browse the repository at this point in the history
Fix names of algorithms printed in debug trace
  • Loading branch information
keithc-ca authored Nov 5, 2024
2 parents e01b9c6 + 4b5b216 commit 3a65100
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,30 +72,30 @@ public final class SunEC extends Provider {
/* The property 'jdk.nativeEC' is used to control enablement of the native
* ECDH implementation.
*/
private static final boolean useNativeECDH = NativeCrypto.isAlgorithmEnabled("jdk.nativeEC", "SunEC");
private static final boolean useNativeECDH = NativeCrypto.isAlgorithmEnabled("jdk.nativeEC", "ECDH");

/* The property 'jdk.nativeECKeyGen' is used to control enablement of the native
* ECKeyGeneration implementation.
* OpenSSL 1.1.0 or above is required for EC key generation support.
*/
private static final boolean useNativeECKeyGen = NativeCrypto.isAlgorithmEnabled("jdk.nativeECKeyGen", "SunEC");
private static final boolean useNativeECKeyGen = NativeCrypto.isAlgorithmEnabled("jdk.nativeECKeyGen", "ECKeyGen");

/* The property 'jdk.nativeECDSA' is used to control enablement of the native
* ECDSA signature implementation.
*/
private static final boolean useNativeECDSA = NativeCrypto.isAlgorithmEnabled("jdk.nativeECDSA", "SunEC");
private static final boolean useNativeECDSA = NativeCrypto.isAlgorithmEnabled("jdk.nativeECDSA", "ECDSA");

/* The property 'jdk.nativeXDHKeyAgreement' is used to control enablement of the native
* XDH key agreement. XDH key agreement is only supported in OpenSSL 1.1.1 and above.
*/
private static final boolean useNativeXDHKeyAgreement =
NativeCrypto.isAlgorithmEnabled("jdk.nativeXDHKeyAgreement", "SunEC");
NativeCrypto.isAlgorithmEnabled("jdk.nativeXDHKeyAgreement", "XDHKeyAgreement");

/* The property 'jdk.nativeXDHKeyGen' is used to control enablement of the native
* XDH key generation. XDH key generation is only supported in OpenSSL 1.1.1 and above.
*/
private static final boolean useNativeXDHKeyGen =
NativeCrypto.isAlgorithmEnabled("jdk.nativeXDHKeyGen", "SunEC");
NativeCrypto.isAlgorithmEnabled("jdk.nativeXDHKeyGen", "XDHKeyGen");

private static class ProviderServiceA extends ProviderService {
ProviderServiceA(Provider p, String type, String algo, String cn,
Expand Down

0 comments on commit 3a65100

Please sign in to comment.