diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-10-12 02:41:27 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-10-12 02:41:27 +0100 |
| commit | 549be25303943738340e1edc22f71672c969cf62 (patch) | |
| tree | ba7ae5a830a9daed37e4fcc556fa2c55671b5810 /include | |
| parent | 5368bf05ed73e8a270490e024586fb25077fa13c (diff) | |
make update
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4485)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/dherr.h | 4 | ||||
| -rw-r--r-- | include/openssl/obj_mac.h | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h index 51b60840a4..02039071e8 100644 --- a/include/openssl/dherr.h +++ b/include/openssl/dherr.h @@ -31,6 +31,7 @@ int ERR_load_DH_strings(void); # define DH_F_DH_METH_DUP 117 # define DH_F_DH_METH_NEW 118 # define DH_F_DH_METH_SET1_NAME 119 +# define DH_F_DH_NEW_BY_NID 104 # define DH_F_DH_NEW_METHOD 105 # define DH_F_DH_PARAM_DECODE 107 # define DH_F_DH_PRIV_DECODE 110 @@ -39,6 +40,7 @@ int ERR_load_DH_strings(void); # define DH_F_DH_PUB_ENCODE 109 # define DH_F_DO_DH_PRINT 100 # define DH_F_GENERATE_KEY 103 +# define DH_F_PKEY_DH_CTRL_STR 120 # define DH_F_PKEY_DH_DERIVE 112 # define DH_F_PKEY_DH_KEYGEN 113 @@ -49,6 +51,8 @@ int ERR_load_DH_strings(void); # define DH_R_BN_DECODE_ERROR 109 # define DH_R_BN_ERROR 106 # define DH_R_DECODE_ERROR 104 +# define DH_R_INVALID_PARAMETER_NAME 110 +# define DH_R_INVALID_PARAMETER_NID 114 # define DH_R_INVALID_PUBKEY 102 # define DH_R_KDF_PARAMETER_ERROR 112 # define DH_R_KEYS_NOT_SET 108 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index d028af9da0..7d8637464e 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -4890,3 +4890,18 @@ #define SN_siphash "SipHash" #define LN_siphash "siphash" #define NID_siphash 1062 + +#define SN_ffdhe2048 "ffdhe2048" +#define NID_ffdhe2048 1126 + +#define SN_ffdhe3072 "ffdhe3072" +#define NID_ffdhe3072 1127 + +#define SN_ffdhe4096 "ffdhe4096" +#define NID_ffdhe4096 1128 + +#define SN_ffdhe6144 "ffdhe6144" +#define NID_ffdhe6144 1129 + +#define SN_ffdhe8192 "ffdhe8192" +#define NID_ffdhe8192 1130 |