diff options
author | djm <> | 2011-11-03 02:32:23 +0000 |
---|---|---|
committer | djm <> | 2011-11-03 02:32:23 +0000 |
commit | 113f799ec7d1728f0a5d7ab5b0e3b42e3de56407 (patch) | |
tree | 26d712b25a8fa580b8f2dfc6df470ba5ffea9eb7 /src/lib/libcrypto/engine/engine.h | |
parent | 829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2 (diff) | |
download | openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.tar.gz openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.tar.bz2 openbsd-113f799ec7d1728f0a5d7ab5b0e3b42e3de56407.zip |
import OpenSSL 1.0.0e
Diffstat (limited to 'src/lib/libcrypto/engine/engine.h')
-rw-r--r-- | src/lib/libcrypto/engine/engine.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 7fbd95f634..943aeae215 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
@@ -677,6 +677,7 @@ typedef struct st_dynamic_fns { | |||
677 | * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */ | 677 | * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */ |
678 | typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); | 678 | typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version); |
679 | #define IMPLEMENT_DYNAMIC_CHECK_FN() \ | 679 | #define IMPLEMENT_DYNAMIC_CHECK_FN() \ |
680 | OPENSSL_EXPORT unsigned long v_check(unsigned long v); \ | ||
680 | OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \ | 681 | OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \ |
681 | if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \ | 682 | if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \ |
682 | return 0; } | 683 | return 0; } |
@@ -700,6 +701,8 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, | |||
700 | const dynamic_fns *fns); | 701 | const dynamic_fns *fns); |
701 | #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \ | 702 | #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \ |
702 | OPENSSL_EXPORT \ | 703 | OPENSSL_EXPORT \ |
704 | int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \ | ||
705 | OPENSSL_EXPORT \ | ||
703 | int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \ | 706 | int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \ |
704 | if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \ | 707 | if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \ |
705 | if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \ | 708 | if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \ |