Commit eef721b0 authored by Shane Lontis's avatar Shane Lontis Committed by Matt Caswell
Browse files

added generated files 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6652)
parent 8240d5fa

crypto/err/openssl.txt

+13 −1
Original line number Diff line number Diff line
@@ -368,8 +368,8 @@ CRYPTO_F_OPENSSL_INIT_CRYPTO:116:OPENSSL_init_crypto 
CRYPTO_F_OPENSSL_LH_NEW:126:OPENSSL_LH_new

CRYPTO_F_OPENSSL_SK_DEEP_COPY:127:OPENSSL_sk_deep_copy

CRYPTO_F_OPENSSL_SK_DUP:128:OPENSSL_sk_dup

CRYPTO_F_OSSL_PROVIDER_ADD_BUILTIN:132:OSSL_PROVIDER_add_builtin

CRYPTO_F_OSSL_PROVIDER_ACTIVATE:130:ossl_provider_activate

CRYPTO_F_OSSL_PROVIDER_ADD_BUILTIN:132:OSSL_PROVIDER_add_builtin

CRYPTO_F_OSSL_PROVIDER_NEW:131:ossl_provider_new

CRYPTO_F_PKEY_HMAC_INIT:123:pkey_hmac_init

CRYPTO_F_PKEY_POLY1305_INIT:124:pkey_poly1305_init
@@ -1101,6 +1101,7 @@ RSA_F_RSA_CHECK_KEY:123:RSA_check_key 
RSA_F_RSA_CHECK_KEY_EX:160:RSA_check_key_ex

RSA_F_RSA_CMS_DECRYPT:159:rsa_cms_decrypt

RSA_F_RSA_CMS_VERIFY:158:rsa_cms_verify

RSA_F_RSA_FIPS186_4_GEN_PROB_PRIMES:168:rsa_fips186_4_gen_prob_primes

RSA_F_RSA_ITEM_VERIFY:148:rsa_item_verify

RSA_F_RSA_METH_DUP:161:RSA_meth_dup

RSA_F_RSA_METH_NEW:162:RSA_meth_new
@@ -1144,6 +1145,10 @@ RSA_F_RSA_PUB_DECODE:139:rsa_pub_decode 
RSA_F_RSA_SETUP_BLINDING:136:RSA_setup_blinding

RSA_F_RSA_SIGN:117:RSA_sign

RSA_F_RSA_SIGN_ASN1_OCTET_STRING:118:RSA_sign_ASN1_OCTET_STRING

RSA_F_RSA_SP800_56B_CHECK_KEYPAIR:169:rsa_sp800_56b_check_keypair

RSA_F_RSA_SP800_56B_CHECK_PUBLIC:170:rsa_sp800_56b_check_public

RSA_F_RSA_SP800_56B_PAIRWISE_TEST:171:rsa_sp800_56b_pairwise_test

RSA_F_RSA_SP800_56B_VALIDATE_STRENGTH:172:rsa_sp800_56b_validate_strength

RSA_F_RSA_VERIFY:119:RSA_verify

RSA_F_RSA_VERIFY_ASN1_OCTET_STRING:120:RSA_verify_ASN1_OCTET_STRING

RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1:126:RSA_verify_PKCS1_PSS_mgf1
@@ -2591,16 +2596,21 @@ RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE:144:\ 
RSA_R_INVALID_DIGEST:157:invalid digest

RSA_R_INVALID_DIGEST_LENGTH:143:invalid digest length

RSA_R_INVALID_HEADER:137:invalid header

RSA_R_INVALID_KEYPAIR:171:invalid keypair

RSA_R_INVALID_KEY_LENGTH:173:invalid key length

RSA_R_INVALID_LABEL:160:invalid label

RSA_R_INVALID_MESSAGE_LENGTH:131:invalid message length

RSA_R_INVALID_MGF1_MD:156:invalid mgf1 md

RSA_R_INVALID_MODULUS:174:invalid modulus

RSA_R_INVALID_MULTI_PRIME_KEY:167:invalid multi prime key

RSA_R_INVALID_OAEP_PARAMETERS:161:invalid oaep parameters

RSA_R_INVALID_PADDING:138:invalid padding

RSA_R_INVALID_PADDING_MODE:141:invalid padding mode

RSA_R_INVALID_PSS_PARAMETERS:149:invalid pss parameters

RSA_R_INVALID_PSS_SALTLEN:146:invalid pss saltlen

RSA_R_INVALID_REQUEST:175:invalid request

RSA_R_INVALID_SALT_LENGTH:150:invalid salt length

RSA_R_INVALID_STRENGTH:176:invalid strength

RSA_R_INVALID_TRAILER:139:invalid trailer

RSA_R_INVALID_X931_DIGEST:142:invalid x931 digest

RSA_R_IQMP_NOT_INVERSE_OF_Q:126:iqmp not inverse of q
@@ -2620,8 +2630,10 @@ RSA_R_OAEP_DECODING_ERROR:121:oaep decoding error 
RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE:148:\

	operation not supported for this keytype

RSA_R_PADDING_CHECK_FAILED:114:padding check failed

RSA_R_PAIRWISE_TEST_FAILURE:177:pairwise test failure

RSA_R_PKCS_DECODING_ERROR:159:pkcs decoding error

RSA_R_PSS_SALTLEN_TOO_SMALL:164:pss saltlen too small

RSA_R_PUB_EXPONENT_OUT_OF_RANGE:178:pub exponent out of range

RSA_R_P_NOT_PRIME:128:p not prime

RSA_R_Q_NOT_PRIME:129:q not prime

RSA_R_RSA_OPERATIONS_NOT_SUPPORTED:130:rsa operations not supported

crypto/rsa/rsa_err.c

+20 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the Apache License 2.0 (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -32,6 +32,8 @@ static const ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_CHECK_KEY_EX, 0), "RSA_check_key_ex"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_CMS_DECRYPT, 0), "rsa_cms_decrypt"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_CMS_VERIFY, 0), "rsa_cms_verify"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_FIPS186_4_GEN_PROB_PRIMES, 0),

     "rsa_fips186_4_gen_prob_primes"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_ITEM_VERIFY, 0), "rsa_item_verify"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_DUP, 0), "RSA_meth_dup"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_NEW, 0), "RSA_meth_new"},
@@ -97,6 +99,14 @@ static const ERR_STRING_DATA RSA_str_functs[] = { 
    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SIGN, 0), "RSA_sign"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SIGN_ASN1_OCTET_STRING, 0),

     "RSA_sign_ASN1_OCTET_STRING"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SP800_56B_CHECK_KEYPAIR, 0),

     "rsa_sp800_56b_check_keypair"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SP800_56B_CHECK_PUBLIC, 0),

     "rsa_sp800_56b_check_public"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SP800_56B_PAIRWISE_TEST, 0),

     "rsa_sp800_56b_pairwise_test"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_SP800_56B_VALIDATE_STRENGTH, 0),

     "rsa_sp800_56b_validate_strength"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_VERIFY, 0), "RSA_verify"},

    {ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_VERIFY_ASN1_OCTET_STRING, 0),

     "RSA_verify_ASN1_OCTET_STRING"},
@@ -146,10 +156,13 @@ static const ERR_STRING_DATA RSA_str_reasons[] = { 
    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST_LENGTH),

    "invalid digest length"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_HEADER), "invalid header"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEYPAIR), "invalid keypair"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEY_LENGTH), "invalid key length"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LABEL), "invalid label"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MESSAGE_LENGTH),

    "invalid message length"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MGF1_MD), "invalid mgf1 md"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MODULUS), "invalid modulus"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MULTI_PRIME_KEY),

    "invalid multi prime key"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_OAEP_PARAMETERS),
@@ -161,8 +174,10 @@ static const ERR_STRING_DATA RSA_str_reasons[] = { 
    "invalid pss parameters"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_SALTLEN),

    "invalid pss saltlen"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_REQUEST), "invalid request"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_SALT_LENGTH),

    "invalid salt length"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_STRENGTH), "invalid strength"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_TRAILER), "invalid trailer"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_X931_DIGEST),

    "invalid x931 digest"},
@@ -193,10 +208,14 @@ static const ERR_STRING_DATA RSA_str_reasons[] = { 
    "operation not supported for this keytype"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PADDING_CHECK_FAILED),

    "padding check failed"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PAIRWISE_TEST_FAILURE),

    "pairwise test failure"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PKCS_DECODING_ERROR),

    "pkcs decoding error"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PSS_SALTLEN_TOO_SMALL),

    "pss saltlen too small"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PUB_EXPONENT_OUT_OF_RANGE),

    "pub exponent out of range"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_P_NOT_PRIME), "p not prime"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_Q_NOT_PRIME), "q not prime"},

    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),

include/openssl/rsaerr.h

+12 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int ERR_load_RSA_strings(void); 
# define RSA_F_RSA_CHECK_KEY_EX                           160

# define RSA_F_RSA_CMS_DECRYPT                            159

# define RSA_F_RSA_CMS_VERIFY                             158

# define RSA_F_RSA_FIPS186_4_GEN_PROB_PRIMES              168

# define RSA_F_RSA_ITEM_VERIFY                            148

# define RSA_F_RSA_METH_DUP                               161

# define RSA_F_RSA_METH_NEW                               162
@@ -82,6 +83,10 @@ int ERR_load_RSA_strings(void); 
# define RSA_F_RSA_SETUP_BLINDING                         136

# define RSA_F_RSA_SIGN                                   117

# define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118

# define RSA_F_RSA_SP800_56B_CHECK_KEYPAIR                169

# define RSA_F_RSA_SP800_56B_CHECK_PUBLIC                 170

# define RSA_F_RSA_SP800_56B_PAIRWISE_TEST                171

# define RSA_F_RSA_SP800_56B_VALIDATE_STRENGTH            172

# define RSA_F_RSA_VERIFY                                 119

# define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120

# define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  126
@@ -114,16 +119,21 @@ int ERR_load_RSA_strings(void); 
# define RSA_R_INVALID_DIGEST                             157

# define RSA_R_INVALID_DIGEST_LENGTH                      143

# define RSA_R_INVALID_HEADER                             137

# define RSA_R_INVALID_KEYPAIR                            171

# define RSA_R_INVALID_KEY_LENGTH                         173

# define RSA_R_INVALID_LABEL                              160

# define RSA_R_INVALID_MESSAGE_LENGTH                     131

# define RSA_R_INVALID_MGF1_MD                            156

# define RSA_R_INVALID_MODULUS                            174

# define RSA_R_INVALID_MULTI_PRIME_KEY                    167

# define RSA_R_INVALID_OAEP_PARAMETERS                    161

# define RSA_R_INVALID_PADDING                            138

# define RSA_R_INVALID_PADDING_MODE                       141

# define RSA_R_INVALID_PSS_PARAMETERS                     149

# define RSA_R_INVALID_PSS_SALTLEN                        146

# define RSA_R_INVALID_REQUEST                            175

# define RSA_R_INVALID_SALT_LENGTH                        150

# define RSA_R_INVALID_STRENGTH                           176

# define RSA_R_INVALID_TRAILER                            139

# define RSA_R_INVALID_X931_DIGEST                        142

# define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
@@ -142,8 +152,10 @@ int ERR_load_RSA_strings(void); 
# define RSA_R_OAEP_DECODING_ERROR                        121

# define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148

# define RSA_R_PADDING_CHECK_FAILED                       114

# define RSA_R_PAIRWISE_TEST_FAILURE                      177

# define RSA_R_PKCS_DECODING_ERROR                        159

# define RSA_R_PSS_SALTLEN_TOO_SMALL                      164

# define RSA_R_PUB_EXPONENT_OUT_OF_RANGE                  178

# define RSA_R_P_NOT_PRIME                                128

# define RSA_R_Q_NOT_PRIME                                129

# define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED               130