Skip to content

Commit

Permalink
Add objects for X25519, X448, Ed25519 and Ed448.
Browse files Browse the repository at this point in the history
ok miod@
  • Loading branch information
4a6f656c committed Nov 5, 2016
1 parent b084c06 commit 67f3f10
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/libcrypto/objects/obj_mac.num
Expand Up @@ -947,3 +947,9 @@ id_tc26_gost3410_2012_256 946
id_tc26_gost3410_2012_512 947
id_tc26_signwithdigest_gost3410_2012_256 948
id_tc26_signwithdigest_gost3410_2012_512 949
X25519 950
X448 951
Ed25519 952
Ed448 953
Ed25519ph 954
Ed448ph 955
9 changes: 9 additions & 0 deletions lib/libcrypto/objects/objects.txt
Expand Up @@ -1313,6 +1313,7 @@ brainpool 1 14 : brainpoolP512t1
# ChaCha Stream Cipher
!Cname chacha20
: ChaCha : chacha

: gost89-ecb
: gost89-cbc

Expand All @@ -1328,3 +1329,11 @@ tc26 1 1 1 : id-tc26-gost3410-2012-256 : GOST R 34.10-2012 (256 bit)
tc26 1 1 2 : id-tc26-gost3410-2012-512 : GOST R 34.10-2012 (512 bit)
tc26 1 3 2 : id-tc26-signwithdigest-gost3410-2012-256 : GOST R 34.11-2012 with GOST R 34.10-2012 (256 bit)
tc26 1 3 3 : id-tc26-signwithdigest-gost3410-2012-512 : GOST R 34.11-2012 with GOST R 34.10-2012 (512 bit)

# Curves from draft-ietf-curdle-pkix-02
1 3 101 110 : X25519
1 3 101 111 : X448
1 3 101 112 : Ed25519
1 3 101 113 : Ed448
1 3 101 114 : Ed25519ph
1 3 101 115 : Ed448ph

0 comments on commit 67f3f10

Please sign in to comment.