diff options
| author |   William Ahern <william@25thandclement.com>
| 2016-12-08 16:43:48 -0800 |
|---|---|---|
| committer | William Ahern <william@25thandclement.com>
| 2016-12-08 16:43:48 -0800 |
| commit | 31b9ba81a28151f39efd8958092d70c51817f81e (patch) | |
| tree | a42f45710c23f52e6bde58e2f39eb9e1d7a44929 | |
| parent | db1240b586261e3404975fa0a00a90a5cffe7363 (diff) | |
| parent | 3d740aca7a31747525a2e67f4d699fd75cf8c6f0 (diff) | |
| download | luaossl-31b9ba81a28151f39efd8958092d70c51817f81e.tar.gz luaossl-31b9ba81a28151f39efd8958092d70c51817f81e.tar.bz2 luaossl-31b9ba81a28151f39efd8958092d70c51817f81e.zip | |
Merge branch 'daurnimator-SSL_new'
| -rw-r--r-- | src/openssl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/openssl.c b/src/openssl.c index 38c9888..a92df1a 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -7903,7 +7903,13 @@ static SSL *ssl_push(lua_State *L, SSL *ssl) { } /* ssl_push() */ static int ssl_new(lua_State *L) { - lua_pushnil(L); + SSL_CTX *ctx = checksimple(L, 1, SSL_CTX_CLASS); + SSL **ud = prepsimple(L, SSL_CLASS); + + *ud = SSL_new(ctx); + + if (!*ud) + return auxL_error(L, auxL_EOPENSSL, "ssl.new"); return 1; } /* ssl_new() */ @@ -8008,7 +8014,7 @@ static int ssl_getHostName(lua_State *L) { static int ssl_setHostName(lua_State *L) { SSL *ssl = checksimple(L, 1, SSL_CLASS); - const char *host = luaL_checkstring(L, 2); + const char *host = luaL_optstring(L, 2, NULL); if (!SSL_set_tlsext_host_name(ssl, host)) return auxL_error(L, auxL_EOPENSSL, "ssl:setHostName"); |