diff options
author | Rich Salz <rsalz@akamai.com> | 2019-06-18 12:06:17 -0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-18 23:21:38 +0200 |
commit | 8908d18cb1020f225170dd9090206842dbb6bbe6 (patch) | |
tree | 461d6e6e12596998c90804ff7487eec4aed56139 /providers/fips | |
parent | 7f02a0932c8c182bc2f6320748d81e86d650c1a6 (diff) |
Change ERR_add_error_[v]data to append
The "add error data" functions now append to the current error.
Add a test for this.
Cleanup some of the ERR_put functions.
In the FIPS module, always append "(in the FIPS module)" to any errors.
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9181)
Diffstat (limited to 'providers/fips')
-rw-r--r-- | providers/fips/fipsprov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 9f9b4289ac..a30ece8e27 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -326,11 +326,13 @@ void ERR_put_error(int lib, int func, int reason, const char *file, int line) * so we'll need to come up with something else for them. */ c_put_error(lib, func, reason, file, line); + ERR_add_error_data(1, "(in the FIPS module)"); } void ERR_add_error_data(int num, ...) { va_list args; + va_start(args, num); ERR_add_error_vdata(num, args); va_end(args); |