diff options
| author | Pauli <paul.dale@oracle.com> | 2020-12-09 14:29:44 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-12-09 21:46:38 +1000 |
| commit | e37b307e02a7dded027ef08ed6b66645a9d0af73 (patch) | |
| tree | 8bc457a0ebe8a8f07b55206aaad9e73fd801fba9 | |
| parent | 81aef6ba720971c09ad68f89d418c8d3d3f904f7 (diff) | |
Fix error clash in build
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13640)
| -rw-r--r-- | crypto/err/openssl.txt | 2 | ||||
| -rw-r--r-- | providers/common/include/prov/providercommonerr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 73f551a3e5..273400e3c4 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2933,7 +2933,7 @@ PROV_R_REQUIRE_CTR_MODE_CIPHER:206:require ctr mode cipher PROV_R_RESEED_ERROR:197:reseed error PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES:222:\ search only supported for directories -PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT:200:\ +PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT:229:\ seed sources must not have a parent PROV_R_SELF_TEST_KAT_FAILURE:215:self test kat failure PROV_R_SELF_TEST_POST_FAILURE:216:self test post failure diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h index f044e7b7c7..ac87f190cb 100644 --- a/providers/common/include/prov/providercommonerr.h +++ b/providers/common/include/prov/providercommonerr.h @@ -154,7 +154,7 @@ int err_load_PROV_strings_int(void); # define PROV_R_REQUIRE_CTR_MODE_CIPHER 206 # define PROV_R_RESEED_ERROR 197 # define PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 222 -# define PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT 200 +# define PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT 229 # define PROV_R_SELF_TEST_KAT_FAILURE 215 # define PROV_R_SELF_TEST_POST_FAILURE 216 # define PROV_R_TAG_NOTSET 119 |