Commit 549be253 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

make update 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4485)
parent 5368bf05

crypto/dh/dh_err.c

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ static const ERR_STRING_DATA DH_str_functs[] = { 
    {ERR_PACK(ERR_LIB_DH, DH_F_DH_METH_DUP, 0), "DH_meth_dup"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_METH_NEW, 0), "DH_meth_new"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_METH_SET1_NAME, 0), "DH_meth_set1_name"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_NEW_BY_NID, 0), "DH_new_by_nid"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_NEW_METHOD, 0), "DH_new_method"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_PARAM_DECODE, 0), "dh_param_decode"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DH_PRIV_DECODE, 0), "dh_priv_decode"},
@@ -33,6 +34,7 @@ static const ERR_STRING_DATA DH_str_functs[] = { 
    {ERR_PACK(ERR_LIB_DH, DH_F_DH_PUB_ENCODE, 0), "dh_pub_encode"},

    {ERR_PACK(ERR_LIB_DH, DH_F_DO_DH_PRINT, 0), "do_dh_print"},

    {ERR_PACK(ERR_LIB_DH, DH_F_GENERATE_KEY, 0), "generate_key"},

    {ERR_PACK(ERR_LIB_DH, DH_F_PKEY_DH_CTRL_STR, 0), "pkey_dh_ctrl_str"},

    {ERR_PACK(ERR_LIB_DH, DH_F_PKEY_DH_DERIVE, 0), "pkey_dh_derive"},

    {ERR_PACK(ERR_LIB_DH, DH_F_PKEY_DH_KEYGEN, 0), "pkey_dh_keygen"},

    {0, NULL}
@@ -43,6 +45,10 @@ static const ERR_STRING_DATA DH_str_reasons[] = { 
    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_DECODE_ERROR), "bn decode error"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_ERROR), "bn error"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_DECODE_ERROR), "decode error"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NAME),

    "invalid parameter name"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NID),

    "invalid parameter nid"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PUBKEY), "invalid public key"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_KDF_PARAMETER_ERROR), "kdf parameter error"},

    {ERR_PACK(ERR_LIB_DH, 0, DH_R_KEYS_NOT_SET), "keys not set"},

crypto/err/openssl.txt

+4 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ DH_F_DH_CMS_SET_SHARED_INFO:116:dh_cms_set_shared_info 
DH_F_DH_METH_DUP:117:DH_meth_dup

DH_F_DH_METH_NEW:118:DH_meth_new

DH_F_DH_METH_SET1_NAME:119:DH_meth_set1_name

DH_F_DH_NEW_BY_NID:104:DH_new_by_nid

DH_F_DH_NEW_METHOD:105:DH_new_method

DH_F_DH_PARAM_DECODE:107:dh_param_decode

DH_F_DH_PRIV_DECODE:110:dh_priv_decode
@@ -365,6 +366,7 @@ DH_F_DH_PUB_DECODE:108:dh_pub_decode 
DH_F_DH_PUB_ENCODE:109:dh_pub_encode

DH_F_DO_DH_PRINT:100:do_dh_print

DH_F_GENERATE_KEY:103:generate_key

DH_F_PKEY_DH_CTRL_STR:120:pkey_dh_ctrl_str

DH_F_PKEY_DH_DERIVE:112:pkey_dh_derive

DH_F_PKEY_DH_KEYGEN:113:pkey_dh_keygen

DSA_F_DSAPARAMS_PRINT:100:DSAparams_print
@@ -1780,6 +1782,8 @@ DH_R_BAD_GENERATOR:101:bad generator 
DH_R_BN_DECODE_ERROR:109:bn decode error

DH_R_BN_ERROR:106:bn error

DH_R_DECODE_ERROR:104:decode error

DH_R_INVALID_PARAMETER_NAME:110:invalid parameter name

DH_R_INVALID_PARAMETER_NID:114:invalid parameter nid

DH_R_INVALID_PUBKEY:102:invalid public key

DH_R_KDF_PARAMETER_ERROR:112:kdf parameter error

DH_R_KEYS_NOT_SET:108:keys not set

crypto/objects/obj_dat.h

+18 −3
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static const unsigned char so[7222] = { 
    0x2A,0x83,0x1A,0x8C,0x9A,0x6E,0x01,0x01,0x24,  /* [ 7212] OBJ_aria_256_gcm */

};



#define NUM_NID 1126

#define NUM_NID 1131

static const ASN1_OBJECT nid_objs[NUM_NID] = {

    {"UNDEF", "undefined", NID_undef},

    {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2146,9 +2146,14 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { 
    {"ARIA-128-GCM", "aria-128-gcm", NID_aria_128_gcm, 9, &so[7194]},

    {"ARIA-192-GCM", "aria-192-gcm", NID_aria_192_gcm, 9, &so[7203]},

    {"ARIA-256-GCM", "aria-256-gcm", NID_aria_256_gcm, 9, &so[7212]},

    {"ffdhe2048", "ffdhe2048", NID_ffdhe2048},

    {"ffdhe3072", "ffdhe3072", NID_ffdhe3072},

    {"ffdhe4096", "ffdhe4096", NID_ffdhe4096},

    {"ffdhe6144", "ffdhe6144", NID_ffdhe6144},

    {"ffdhe8192", "ffdhe8192", NID_ffdhe8192},

};



#define NUM_SN 1117

#define NUM_SN 1122

static const unsigned int sn_objs[NUM_SN] = {

     364,    /* "AD_DVCS" */

     419,    /* "AES-128-CBC" */
@@ -2572,6 +2577,11 @@ static const unsigned int sn_objs[NUM_SN] = { 
     372,    /* "extendedStatus" */

     867,    /* "facsimileTelephoneNumber" */

     462,    /* "favouriteDrink" */

    1126,    /* "ffdhe2048" */

    1127,    /* "ffdhe3072" */

    1128,    /* "ffdhe4096" */

    1129,    /* "ffdhe6144" */

    1130,    /* "ffdhe8192" */

     857,    /* "freshestCRL" */

     453,    /* "friendlyCountry" */

     490,    /* "friendlyCountryName" */
@@ -3269,7 +3279,7 @@ static const unsigned int sn_objs[NUM_SN] = { 
    1093,    /* "x509ExtAdmission" */

};



#define NUM_LN 1117

#define NUM_LN 1122

static const unsigned int ln_objs[NUM_LN] = {

     363,    /* "AD Time Stamping" */

     405,    /* "ANSI X9.62" */
@@ -3723,6 +3733,11 @@ static const unsigned int ln_objs[NUM_LN] = { 
      56,    /* "extendedCertificateAttributes" */

     867,    /* "facsimileTelephoneNumber" */

     462,    /* "favouriteDrink" */

    1126,    /* "ffdhe2048" */

    1127,    /* "ffdhe3072" */

    1128,    /* "ffdhe4096" */

    1129,    /* "ffdhe6144" */

    1130,    /* "ffdhe8192" */

     453,    /* "friendlyCountry" */

     490,    /* "friendlyCountryName" */

     156,    /* "friendlyName" */

crypto/objects/obj_mac.num

+5 −0
Original line number Diff line number Diff line
@@ -1123,3 +1123,8 @@ aria_256_ccm 1122 
aria_128_gcm		1123

aria_192_gcm		1124

aria_256_gcm		1125

ffdhe2048		1126

ffdhe3072		1127

ffdhe4096		1128

ffdhe6144		1129

ffdhe8192		1130

include/openssl/dherr.h

+4 −0
Original line number Diff line number Diff line
@@ -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