projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the transfer of lock hooks from bind_engine
[oweals/openssl.git]
/
crypto
/
err
/
err_all.c
diff --git
a/crypto/err/err_all.c
b/crypto/err/err_all.c
index d9a2a576824c453e4d11eb047d5dd368e4e5e753..be6a30e93ba8c08f649044e06784d7749c1c2b95 100644
(file)
--- a/
crypto/err/err_all.c
+++ b/
crypto/err/err_all.c
@@
-1,4
+1,3
@@
-/* crypto/err/err_all.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@
-57,6
+56,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <internal/err.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_EC
#include <openssl/asn1.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_EC
@@
-76,10
+76,6
@@
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
-#ifndef OPENSSL_NO_EC
-# include <openssl/ecdsa.h>
-# 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>
@@
-102,12
+98,13
@@
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
-#ifndef OPENSSL_NO_
JPAKE
-# include <openssl/
jpake
.h>
+#ifndef OPENSSL_NO_
CT
+# include <openssl/
ct
.h>
#endif
#endif
-#include <internal/ct_int.h>
+#include <openssl/async.h>
+#include <openssl/kdf.h>
-void
ERR_load_crypto_strings
(void)
+void
err_load_crypto_strings_intern
(void)
{
#ifdef OPENSSL_FIPS
FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
{
#ifdef OPENSSL_FIPS
FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
@@
-137,8
+134,6
@@
void ERR_load_crypto_strings(void)
# endif
# ifndef OPENSSL_NO_EC
ERR_load_EC_strings();
# endif
# ifndef OPENSSL_NO_EC
ERR_load_EC_strings();
- ERR_load_ECDSA_strings();
- 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();
@@
-159,11
+154,10
@@
void ERR_load_crypto_strings(void)
# ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings();
# endif
# ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings();
# endif
-# ifndef OPENSSL_NO_JPAKE
- ERR_load_JPAKE_strings();
-# endif
# ifndef OPENSSL_NO_CT
ERR_load_CT_strings();
# endif
# ifndef OPENSSL_NO_CT
ERR_load_CT_strings();
# endif
+ ERR_load_ASYNC_strings();
#endif
#endif
+ ERR_load_KDF_strings();
}
}