From 03e5c6c13c3da0798b4fe0c91f79d3e587d27ce6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 26 Mar 2022 13:05:28 -0400
Subject: [PATCH] Crypto: Add official EdDSA OIDs to provider

---
 core/java/src/net/i2p/crypto/provider/I2PProvider.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/java/src/net/i2p/crypto/provider/I2PProvider.java b/core/java/src/net/i2p/crypto/provider/I2PProvider.java
index 3c0e28a15d..086d06554e 100644
--- a/core/java/src/net/i2p/crypto/provider/I2PProvider.java
+++ b/core/java/src/net/i2p/crypto/provider/I2PProvider.java
@@ -72,6 +72,14 @@ public final class I2PProvider extends Provider {
         // but this works fine with programmatic cert generation
         put("Alg.Alias.Signature.1.3.101.101", "SHA512withEdDSA");
         put("Alg.Alias.Signature.OID.1.3.101.101", "SHA512withEdDSA");
+        // The official OID is now 1.3.101.112 for pubkeys, privkeys, and sigs
+        // See RFC 8410 and RFC 8420
+        put("Alg.Alias.KeyFactory.1.3.101.112", "EdDSA");
+        put("Alg.Alias.KeyFactory.OID.1.3.101.112", "EdDSA");
+        put("Alg.Alias.KeyPairGenerator.1.3.101.112", "EdDSA");
+        put("Alg.Alias.KeyPairGenerator.OID.1.3.101.112", "EdDSA");
+        put("Alg.Alias.Signature.1.3.101.112", "SHA512withEdDSA");
+        put("Alg.Alias.Signature.OID.1.3.101.112", "SHA512withEdDSA");
         // TODO Ed25519ph
         // OID: 1.3.101.101
 
-- 
GitLab