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

net.nim: destroyContext for destroying SSLContext

Browse source
This commit is contained in:
Michał Zieliński 2015-10-24 22:48:33 +02:00
commit 3ecf33fa6a
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/ssl/pskclient.nim
View file

@ -13,3 +13,4 @@ proc clientFunc(identityHint: string): tuple[identity: string, psk: string] =
let context = newContext(cipherList="PSK-AES256-CBC-SHA") let context = newContext(cipherList="PSK-AES256-CBC-SHA")
context.clientGetPskFunc = clientFunc context.clientGetPskFunc = clientFunc
context.wrapConnectedSocket(sock, handshakeAsClient) context.wrapConnectedSocket(sock, handshakeAsClient)
context.destroyContext()

8
lib/pure/net.nim
View file

@ -267,7 +267,6 @@ when defined(ssl):
newCTX.loadCertificates(certFile, keyFile) newCTX.loadCertificates(certFile, keyFile)
result = SSLContext(newCTX) result = SSLContext(newCTX)
# this is never freed, but SSLContext can't be freed anyway yet
let extraInternal = new(SslContextExtraInternal) let extraInternal = new(SslContextExtraInternal)
GC_ref(extraInternal) GC_ref(extraInternal)
result.setExtraData(extraInternalIndex, cast[pointer](extraInternal)) result.setExtraData(extraInternalIndex, cast[pointer](extraInternal))
@ -275,6 +274,13 @@ when defined(ssl):
proc getExtraInternal(ctx: SSLContext): SslContextExtraInternal = proc getExtraInternal(ctx: SSLContext): SslContextExtraInternal =
return cast[SslContextExtraInternal](ctx.getExtraData(extraInternalIndex)) return cast[SslContextExtraInternal](ctx.getExtraData(extraInternalIndex))
proc destroyContext*(ctx: SSLContext) =
## Free memory referenced by SSLContext.
let extraInternal = ctx.getExtraInternal()
if extraInternal != nil:
GC_unref(extraInternal)
SSLCTX(ctx).SSL_CTX_free()
proc `pskIdentityHint=`*(ctx: SSLContext, hint: string) = proc `pskIdentityHint=`*(ctx: SSLContext, hint: string) =
## Sets the identity hint passed to server. ## Sets the identity hint passed to server.
## ##