diff options
| author | miod <> | 2014-11-09 19:17:13 +0000 |
|---|---|---|
| committer | miod <> | 2014-11-09 19:17:13 +0000 |
| commit | 12455d6eff265f95b0a7e20595630321799f50a2 (patch) | |
| tree | 8f4747a1df4b007feca32e262b38052339c686c1 /src/lib/libcrypto/err/err_all.c | |
| parent | a3c50c7d270773c83559454fd2b75ec6e04f43ab (diff) | |
| download | openbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.gz openbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.bz2 openbsd-12455d6eff265f95b0a7e20595630321799f50a2.zip | |
GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.
This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.
None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.
Diffstat (limited to 'src/lib/libcrypto/err/err_all.c')
| -rw-r--r-- | src/lib/libcrypto/err/err_all.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index 7362220824..c880f1fbf3 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err_all.c,v 1.18 2014/10/18 17:08:32 jsing Exp $ */ | 1 | /* $OpenBSD: err_all.c,v 1.19 2014/11/09 19:17:13 miod Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -105,6 +105,9 @@ | |||
| 105 | #ifndef OPENSSL_NO_RSA | 105 | #ifndef OPENSSL_NO_RSA |
| 106 | #include <openssl/rsa.h> | 106 | #include <openssl/rsa.h> |
| 107 | #endif | 107 | #endif |
| 108 | #ifndef OPENSSL_NO_GOST | ||
| 109 | #include <openssl/gost.h> | ||
| 110 | #endif | ||
| 108 | 111 | ||
| 109 | void | 112 | void |
| 110 | ERR_load_crypto_strings(void) | 113 | ERR_load_crypto_strings(void) |
| @@ -157,5 +160,8 @@ ERR_load_crypto_strings(void) | |||
| 157 | #ifndef OPENSSL_NO_CMS | 160 | #ifndef OPENSSL_NO_CMS |
| 158 | ERR_load_CMS_strings(); | 161 | ERR_load_CMS_strings(); |
| 159 | #endif | 162 | #endif |
| 163 | #ifndef OPENSSL_NO_GOST | ||
| 164 | ERR_load_GOST_strings(); | ||
| 165 | #endif | ||
| 160 | #endif | 166 | #endif |
| 161 | } | 167 | } |
