The branch master has been updated via 29253e1e87f4d417f4a082f6193ba539f9b9b1a5 (commit) via 5642882f11b0ca6b026b20775c0cddf4a29bc26c (commit) from da5f770ae31e0df17b1b8a143d13fee805d8deb3 (commit)
- Log ----------------------------------------------------------------- commit 29253e1e87f4d417f4a082f6193ba539f9b9b1a5 Author: Sven Schwermer <sven.schwer...@disruptive-technologies.com> Date: Thu May 27 08:41:07 2021 +0200 ERR: Rebuild generated engine error files CLA: trivial Signed-off-by: Sven Schwermer <sven.schwer...@disruptive-technologies.com> Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15495) commit 5642882f11b0ca6b026b20775c0cddf4a29bc26c Author: Sven Schwermer <sven.schwer...@disruptive-technologies.com> Date: Thu May 27 08:33:08 2021 +0200 mkerr: Fix string literal conversion This fixes a compiler warning on clang-1205.0.22.9 when compiling the generated code as C++11: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings] CLA: trivial Signed-off-by: Sven Schwermer <sven.schwer...@disruptive-technologies.com> Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15495) ----------------------------------------------------------------------- Summary of changes: engines/e_afalg_err.c | 4 ++-- engines/e_capi_err.c | 4 ++-- engines/e_dasync_err.c | 4 ++-- engines/e_loader_attic_err.c | 4 ++-- engines/e_ossltest_err.c | 4 ++-- util/mkerr.pl | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/engines/e_afalg_err.c b/engines/e_afalg_err.c index cc365064ef..47a3d034e5 100644 --- a/engines/e_afalg_err.c +++ b/engines/e_afalg_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -62,7 +62,7 @@ static void ERR_unload_AFALG_strings(void) } } -static void ERR_AFALG_error(int function, int reason, char *file, int line) +static void ERR_AFALG_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library(); diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c index 12eb8e0a89..1d7636562e 100644 --- a/engines/e_capi_err.c +++ b/engines/e_capi_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -85,7 +85,7 @@ static void ERR_unload_CAPI_strings(void) } } -static void ERR_CAPI_error(int function, int reason, char *file, int line) +static void ERR_CAPI_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library(); diff --git a/engines/e_dasync_err.c b/engines/e_dasync_err.c index 1ee237a54d..16021f3196 100644 --- a/engines/e_dasync_err.c +++ b/engines/e_dasync_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -47,7 +47,7 @@ static void ERR_unload_DASYNC_strings(void) } } -static void ERR_DASYNC_error(int function, int reason, char *file, int line) +static void ERR_DASYNC_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library(); diff --git a/engines/e_loader_attic_err.c b/engines/e_loader_attic_err.c index 2bc4e854c8..d7c71463d8 100644 --- a/engines/e_loader_attic_err.c +++ b/engines/e_loader_attic_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -64,7 +64,7 @@ static void ERR_unload_ATTIC_strings(void) } } -static void ERR_ATTIC_error(int function, int reason, char *file, int line) +static void ERR_ATTIC_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library(); diff --git a/engines/e_ossltest_err.c b/engines/e_ossltest_err.c index 141fcd1ca9..f229aeb438 100644 --- a/engines/e_ossltest_err.c +++ b/engines/e_ossltest_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2021 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 @@ -47,7 +47,7 @@ static void ERR_unload_OSSLTEST_strings(void) } } -static void ERR_OSSLTEST_error(int function, int reason, char *file, int line) +static void ERR_OSSLTEST_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library(); diff --git a/util/mkerr.pl b/util/mkerr.pl index ab25b8fc96..1cb772c00f 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -459,7 +459,7 @@ extern \"C\" { # endif int ERR_load_${lib}_strings(void); void ERR_unload_${lib}_strings(void); -void ERR_${lib}_error(int function, int reason, char *file, int line); +void ERR_${lib}_error(int function, int reason, const char *file, int line); # ifdef __cplusplus } # endif @@ -621,7 +621,7 @@ ${st}void ERR_unload_${lib}_strings(void) } } -${st}void ERR_${lib}_error(int function, int reason, char *file, int line) +${st}void ERR_${lib}_error(int function, int reason, const char *file, int line) { if (lib_code == 0) lib_code = ERR_get_next_error_library();