diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-22 14:27:09 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-28 22:54:53 +0000 |
| commit | 899cf48f17ba95a7bd986bbeffeebf9a1d9fd3fb (patch) | |
| tree | 7bb4ec69ba356ba2ebbe71068b9bdec616cb5746 /include | |
| parent | 17fa4e8eda466dc36fd0c332bb7adc4f331dd480 (diff) | |
Rename OIDs.
Use standard X25519 and X448 names for OIDs. Delete EdDSA OIDs: for now they
wont be used and EdDSA may use a different format.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/obj_mac.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index aa640b03e5..b58c44db73 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -4525,18 +4525,10 @@ #define NID_pkInitKDC 1033 #define OBJ_pkInitKDC OBJ_id_pkinit,5L -#define SN_Curve25519 "Curve25519" -#define NID_Curve25519 1034 -#define OBJ_Curve25519 1L,3L,6L,1L,4L,1L,11591L,15L,1L +#define SN_X25519 "X25519" +#define NID_X25519 1034 +#define OBJ_X25519 1L,3L,6L,1L,4L,1L,11591L,15L,1L -#define SN_Curve448 "Curve448" -#define NID_Curve448 1035 -#define OBJ_Curve448 1L,3L,6L,1L,4L,1L,11591L,15L,2L - -#define SN_Curve25519ph "Curve25519ph" -#define NID_Curve25519ph 1036 -#define OBJ_Curve25519ph 1L,3L,6L,1L,4L,1L,11591L,15L,3L - -#define SN_Curve448ph "Curve448ph" -#define NID_Curve448ph 1037 -#define OBJ_Curve448ph 1L,3L,6L,1L,4L,1L,11591L,15L,4L +#define SN_X448 "X448" +#define NID_X448 1035 +#define OBJ_X448 1L,3L,6L,1L,4L,1L,11591L,15L,2L |