diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-10-26 21:07:28 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-10-26 21:07:28 +0000 |
| commit | 5270e7025e11b2fd1a5bdf8d81feded1167b1c87 (patch) | |
| tree | 3bb44c37f4bb6469f738a10127050b023e0d7fb5 /crypto/err/err_all.c | |
| parent | 1df586bec20de86c3086181c565aaee7629bb0a2 (diff) | |
| download | openssl-5270e7025e11b2fd1a5bdf8d81feded1167b1c87.tar.gz | |
Merge the engine branch into the main trunk. All conflicts resolved.
At the same time, add VMS support for Rijndael.
Diffstat (limited to 'crypto/err/err_all.c')
| -rw-r--r-- | crypto/err/err_all.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 638ed3fe71..b8315d8272 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -81,8 +81,9 @@ #include <openssl/conf.h> #include <openssl/pkcs12.h> #include <openssl/rand.h> -#include <openssl/err.h> #include <openssl/dso.h> +#include <openssl/engine.h> +#include <openssl/err.h> void ERR_load_crypto_strings(void) { @@ -120,5 +121,6 @@ void ERR_load_crypto_strings(void) ERR_load_PKCS12_strings(); ERR_load_RAND_strings(); ERR_load_DSO_strings(); + ERR_load_ENGINE_strings(); #endif } |