diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-12 10:36:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-24 15:22:33 +0100 |
| commit | 14a6c6a4e1eb8127514e6f5319701a1d7c3f5e82 (patch) | |
| tree | ac6257150d9944565e19644c7acf0f859458da57 /providers/common | |
| parent | f5a46ed7fe66520c6f1016eb96e96cb241ba229f (diff) | |
ERR: Rebuild all generated error headers and source files
This is the result of 'make errors ERROR_REBUILD=-rebuild'
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13390)
Diffstat (limited to 'providers/common')
| -rw-r--r-- | providers/common/include/prov/providercommonerr.h | 16 | ||||
| -rw-r--r-- | providers/common/provider_err.c | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h index 86a3667641..fd0d7f0380 100644 --- a/providers/common/include/prov/providercommonerr.h +++ b/providers/common/include/prov/providercommonerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-2020 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 @@ -8,18 +8,18 @@ * https://www.openssl.org/source/license.html */ -#ifndef OPENSSL_PROVERR_H -# define OPENSSL_PROVERR_H +#ifndef OSSL_PROVIDERCOMMONERR_H +# define OSSL_PROVIDERCOMMONERR_H # pragma once # include <openssl/opensslconf.h> # include <openssl/symhacks.h> - # ifdef __cplusplus -extern "C" +extern "C" { # endif -int ERR_load_PROV_strings(void); + +int err_load_PROV_strings_int(void); /* * PROV function codes. @@ -178,4 +178,8 @@ int ERR_load_PROV_strings(void); # define PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE 148 # define PROV_R_XTS_DUPLICATED_KEYS 149 + +# ifdef __cplusplus +} +# endif #endif diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c index 2915330b86..7bf2a55d99 100644 --- a/providers/common/provider_err.c +++ b/providers/common/provider_err.c @@ -9,7 +9,7 @@ */ #include <openssl/err.h> -#include "prov/providercommonerr.h" +#include "include/prov/providercommonerr.h" #ifndef OPENSSL_NO_ERR @@ -223,7 +223,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = { #endif -int ERR_load_PROV_strings(void) +int err_load_PROV_strings_int(void) { #ifndef OPENSSL_NO_ERR if (ERR_reason_error_string(PROV_str_reasons[0].error) == NULL) |