Add JPAKE.

[openssl.git] / crypto / err / err_all.c

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index b088de65f5f30d94f473bc6ed999653b421bc249..5ab89f9498a9284aa770cdea1b9442288cd669c4 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -64,6 +64,7 @@
 #endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
+#include <openssl/comp.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
@@ -73,6 +74,12 @@
 #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>
@@ -82,16 +89,21 @@
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include <openssl/dso.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
+#include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
+#include <openssl/ts.h>
+#ifndef OPENSSL_NO_CMS
+#include <openssl/cms.h>
+#endif
+
+#include <openssl/jpake.h>
 
 void ERR_load_crypto_strings(void)
        {
-       static int done=0;
-
-       if (done) return;
-       done=1;
 #ifndef OPENSSL_NO_ERR
        ERR_load_ERR_strings(); /* include error strings for SYSerr */
        ERR_load_BN_strings();
@@ -112,8 +124,15 @@ void ERR_load_crypto_strings(void)
        ERR_load_ASN1_strings();
        ERR_load_CONF_strings();
        ERR_load_CRYPTO_strings();
+       ERR_load_COMP_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();
@@ -122,7 +141,15 @@ void ERR_load_crypto_strings(void)
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
        ERR_load_DSO_strings();
+       ERR_load_TS_strings();
+#ifndef OPENSSL_NO_ENGINE
        ERR_load_ENGINE_strings();
+#endif
        ERR_load_OCSP_strings();
+       ERR_load_UI_strings();
+#ifndef OPENSSL_NO_CMS
+       ERR_load_CMS_strings();
+#endif
+       ERR_load_JPAKE_strings();
 #endif
        }