projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Since we're moving between directories, let's get an absolute path to
[oweals/openssl.git]
/
crypto
/
err
/
err_all.c
diff --git
a/crypto/err/err_all.c
b/crypto/err/err_all.c
index 90029fd159faeac2000c90419323ba08ceb4c4a2..9b19ad7edfe9384adb531265d18b6da216cacc5c 100644
(file)
--- a/
crypto/err/err_all.c
+++ b/
crypto/err/err_all.c
@@
-73,6
+73,12
@@
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
+#ifndef OPENSSL_NO_ECDSA
+#include <openssl/ecdsa.h>
+#endif
+#ifndef OPENSSL_NO_ECDH
+#include <openssl/ecdh.h>
+#endif
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem2.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem2.h>
@@
-82,9
+88,13
@@
#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include <openssl/dso.h>
#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include <openssl/dso.h>
+#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#include <openssl/engine.h>
+#endif
+#include <openssl/ui.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
+#include <openssl/ts.h>
void ERR_load_crypto_strings(void)
{
void ERR_load_crypto_strings(void)
{
@@
-114,6
+124,12
@@
void ERR_load_crypto_strings(void)
ERR_load_CRYPTO_strings();
#ifndef OPENSSL_NO_EC
ERR_load_EC_strings();
ERR_load_CRYPTO_strings();
#ifndef OPENSSL_NO_EC
ERR_load_EC_strings();
+#endif
+#ifndef OPENSSL_NO_ECDSA
+ ERR_load_ECDSA_strings();
+#endif
+#ifndef OPENSSL_NO_ECDH
+ ERR_load_ECDH_strings();
#endif
/* skip ERR_load_SSL_strings() because it is not in this library */
ERR_load_BIO_strings();
#endif
/* skip ERR_load_SSL_strings() because it is not in this library */
ERR_load_BIO_strings();
@@
-122,7
+138,10
@@
void ERR_load_crypto_strings(void)
ERR_load_PKCS12_strings();
ERR_load_RAND_strings();
ERR_load_DSO_strings();
ERR_load_PKCS12_strings();
ERR_load_RAND_strings();
ERR_load_DSO_strings();
+ ERR_load_TS_strings();
+#ifndef OPENSSL_NO_ENGINE
ERR_load_ENGINE_strings();
ERR_load_ENGINE_strings();
+#endif
ERR_load_OCSP_strings();
ERR_load_UI_strings();
#endif
ERR_load_OCSP_strings();
ERR_load_UI_strings();
#endif