diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/symhacks.h | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/symhacks.h')
| -rw-r--r-- | src/lib/libcrypto/symhacks.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/libcrypto/symhacks.h b/src/lib/libcrypto/symhacks.h index 64528ad5c2..6cfb5fe479 100644 --- a/src/lib/libcrypto/symhacks.h +++ b/src/lib/libcrypto/symhacks.h | |||
| @@ -179,6 +179,11 @@ | |||
| 179 | #define ENGINE_set_load_privkey_function ENGINE_set_load_privkey_fn | 179 | #define ENGINE_set_load_privkey_function ENGINE_set_load_privkey_fn |
| 180 | #undef ENGINE_get_load_privkey_function | 180 | #undef ENGINE_get_load_privkey_function |
| 181 | #define ENGINE_get_load_privkey_function ENGINE_get_load_privkey_fn | 181 | #define ENGINE_get_load_privkey_function ENGINE_get_load_privkey_fn |
| 182 | #undef ENGINE_set_load_ssl_client_cert_function | ||
| 183 | #define ENGINE_set_load_ssl_client_cert_function \ | ||
| 184 | ENGINE_set_ld_ssl_clnt_cert_fn | ||
| 185 | #undef ENGINE_get_ssl_client_cert_function | ||
| 186 | #define ENGINE_get_ssl_client_cert_function ENGINE_get_ssl_client_cert_fn | ||
| 182 | 187 | ||
| 183 | /* Hack some long OCSP names */ | 188 | /* Hack some long OCSP names */ |
| 184 | #undef OCSP_REQUEST_get_ext_by_critical | 189 | #undef OCSP_REQUEST_get_ext_by_critical |