jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #3748 (#20563)

Browse source 
* fixes #3748

* fix the regression

* don't use the new allocator for the SSL wrapper

* fixes regression
This commit is contained in:
Andreas Rumpf 2022-10-14 12:00:38 +02:00 • committed by GitHub
commit 07b645342a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/wrappers/openssl.nim
View file

@ -531,7 +531,10 @@ proc i2d_X509*(cert: PX509): string =
if length.int <= 0:
raise newException(Exception, "X.509 certificate encoding failed")
when not useWinVersion and not defined(macosx) and not defined(android) and not defined(nimNoAllocForSSL):
const
useNimsAlloc = not defined(nimNoAllocForSSL) and not defined(gcDestructors)
when not useWinVersion and not defined(macosx) and not defined(android) and useNimsAlloc:
proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl,
dynlib: DLLUtilName, importc.}
@ -545,7 +548,7 @@ when not useWinVersion and not defined(macosx) and not defined(android) and not
if p != nil: deallocShared(p)
proc CRYPTO_malloc_init*() =
when not useWinVersion and not defined(macosx) and not defined(android) and not defined(nimNoAllocForSSL):
when not useWinVersion and not defined(macosx) and not defined(android) and useNimsAlloc:
CRYPTO_set_mem_functions(allocWrapper, reallocWrapper, deallocWrapper)
proc SSL_CTX_ctrl*(ctx: SslCtx, cmd: cint, larg: clong, parg: pointer): clong{.