diff options
author | Dominik Picheta <dominikpicheta@googlemail.com> | 2013-06-25 13:17:58 -0700 |
---|---|---|
committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2013-06-25 13:17:58 -0700 |
commit | 5d3b5eb700caccc07ae2d69b80ae2c7b6d5d77d0 (patch) | |
tree | c061f72f2ca9cf86894d5c256da804bf7724b615 /lib/wrappers | |
parent | bacb20a379a7ce607bc53f9c917ac675579569a8 (diff) | |
parent | 705e8e929a230757fc8bc33848878f5116b20195 (diff) | |
download | Nim-5d3b5eb700caccc07ae2d69b80ae2c7b6d5d77d0.tar.gz |
Merge pull request #489 from onionhammer/patch-1
Fix: OpenSSL on Windows
Diffstat (limited to 'lib/wrappers')
-rw-r--r-- | lib/wrappers/openssl.nim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index ca4ad6a99..f310c969b 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -196,7 +196,7 @@ const proc SSL_library_init*(): cInt{.cdecl, dynlib: DLLSSLName, importc, discardable.} proc SSL_load_error_strings*(){.cdecl, dynlib: DLLSSLName, importc.} -proc ERR_load_BIO_strings*(){.cdecl, dynlib: DLLSSLName, importc.} +proc ERR_load_BIO_strings*(){.cdecl, dynlib: DLLUtilName, importc.} proc SSLv23_client_method*(): PSSL_METHOD{.cdecl, dynlib: DLLSSLName, importc.} proc SSLv23_method*(): PSSL_METHOD{.cdecl, dynlib: DLLSSLName, importc.} @@ -262,14 +262,15 @@ proc ERR_error_string*(e: cInt, buf: cstring): cstring{.cdecl, proc ERR_get_error*(): cInt{.cdecl, dynlib: DLLUtilName, importc.} proc ERR_peek_last_error*(): cInt{.cdecl, dynlib: DLLUtilName, importc.} -proc OpenSSL_add_all_algorithms*(){.cdecl, dynlib: DLLSSLName, importc: "OPENSSL_add_all_algorithms_conf".} +proc OpenSSL_add_all_algorithms*(){.cdecl, dynlib: DLLUtilName, importc: "OPENSSL_add_all_algorithms_conf".} proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLSSLName, importc.} proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, dynlib: DLLSSLName, importc.} proc CRYPTO_malloc_init*() = - CRYPTO_set_mem_functions(alloc, realloc, dealloc) + when not defined(windows): + CRYPTO_set_mem_functions(alloc, realloc, dealloc) when True: nil |