Skip to content

Commit 1098634

Browse files
committed
Revert "Use current Ed25519 OID"
This reverts commit c11e9b7.
1 parent a150eaf commit 1098634

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,14 @@ public byte[] getEncoded() {
119119
// not in the Josefsson example
120120
rv[idx++] = 0x30;
121121
rv[idx++] = 8;
122-
// OID 1.3.101.112
122+
// OID 1.3.101.100
123123
// https://msdn.microsoft.com/en-us/library/windows/desktop/bb540809%28v=vs.85%29.aspx
124124
// not in the Josefsson example
125-
//
126-
// https://datatracker.ietf.org/doc/draft-ietf-curdle-pkix/?include_text=1
127-
// id-Ed25519 OBJECT IDENTIFIER ::= { 1 3 101 112 }
128125
rv[idx++] = 0x06;
129126
rv[idx++] = 3;
130127
rv[idx++] = (1 * 40) + 3;
131128
rv[idx++] = 101;
132-
rv[idx++] = 112;
129+
rv[idx++] = 100;
133130
// params
134131
rv[idx++] = 0x0a;
135132
rv[idx++] = 1;

src/net/i2p/crypto/eddsa/EdDSAPublicKey.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,13 @@ public byte[] getEncoded() {
9595
// sequence
9696
rv[idx++] = 0x30;
9797
rv[idx++] = 8;
98-
// OID 1.3.101.112
98+
// OID 1.3.101.100
9999
// https://msdn.microsoft.com/en-us/library/windows/desktop/bb540809%28v=vs.85%29.aspx
100-
// not in the Josefsson example
101-
//
102-
// https://datatracker.ietf.org/doc/draft-ietf-curdle-pkix/?include_text=1
103-
// id-Ed25519 OBJECT IDENTIFIER ::= { 1 3 101 112 }
104100
rv[idx++] = 0x06;
105101
rv[idx++] = 3;
106102
rv[idx++] = (1 * 40) + 3;
107103
rv[idx++] = 101;
108-
rv[idx++] = 112;
104+
rv[idx++] = 100;
109105
// params
110106
rv[idx++] = 0x0a;
111107
rv[idx++] = 1;

0 commit comments

Comments
 (0)