From 3070264525b2324b4b371b2751c6a49abce79b51 Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Sun, 4 May 2014 23:48:38 -0400 Subject: [PATCH 1/2] Added define check for openBSD around fmtmsg.h stuff, OpenBSD does not actually include this header --- lib/posix/posix.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim index e206447cc5..cdca826ca1 100644 --- a/lib/posix/posix.nim +++ b/lib/posix/posix.nim @@ -846,7 +846,7 @@ var FE_UPWARD* {.importc, header: "".}: cint FE_DFL_ENV* {.importc, header: "".}: cint -when not defined(haiku): +when not defined(haiku) and not defined(OpenBSD): var MM_HARD* {.importc, header: "".}: cint ## Source of the condition is hardware. @@ -1816,7 +1816,7 @@ proc feholdexcept*(a1: ptr Tfenv): cint {.importc, header: "".} proc fesetenv*(a1: ptr Tfenv): cint {.importc, header: "".} proc feupdateenv*(a1: ptr Tfenv): cint {.importc, header: "".} -when not defined(haiku): +when not defined(haiku) and not defined(OpenBSD): proc fmtmsg*(a1: int, a2: cstring, a3: cint, a4, a5, a6: cstring): cint {.importc, header: "".} From 46d4e5d052f43a1e2d7e93ef2cf431b0a0201ee5 Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Sat, 10 May 2014 18:54:30 -0400 Subject: [PATCH 2/2] changed openssl to import CRYPTO_mem_set_functions from libcrypto and made sockets.nim exclude the sslv2 code on BSD --- lib/pure/sockets.nim | 2 +- lib/wrappers/openssl.nim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim index 8d96cbaaff..7b8b3d5577 100644 --- a/lib/pure/sockets.nim +++ b/lib/pure/sockets.nim @@ -295,7 +295,7 @@ when defined(ssl): of protSSLv23: newCTX = SSL_CTX_new(SSLv23_method()) # SSlv2,3 and TLS1 support. of protSSLv2: - when not defined(linux): + when not defined(linux) and not defined(OpenBSD): newCTX = SSL_CTX_new(SSLv2_method()) else: SSLError() diff --git a/lib/wrappers/openssl.nim b/lib/wrappers/openssl.nim index 90c398dceb..bbcb2175e9 100644 --- a/lib/wrappers/openssl.nim +++ b/lib/wrappers/openssl.nim @@ -270,7 +270,7 @@ proc OPENSSL_config*(configName: cstring){.cdecl, dynlib: DLLSSLName, importc.} when not defined(windows): proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, - dynlib: DLLSSLName, importc.} + dynlib: DLLUtilName, importc.} proc CRYPTO_malloc_init*() = when not defined(windows):