summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Ahern <william@server.local>2012-10-15 12:39:39 -0700
committerWilliam Ahern <william@server.local>2012-10-15 12:39:39 -0700
commit728572def225bd84236ef0d93e8273b27a683063 (patch)
tree09f8b14893316260e0542515150edec7e0f78f18
parent3575f08d8eb9f6b2cb1b334c5108af1e00699acf (diff)
downloadluaossl-728572def225bd84236ef0d93e8273b27a683063.tar.gz
luaossl-728572def225bd84236ef0d93e8273b27a683063.tar.bz2
luaossl-728572def225bd84236ef0d93e8273b27a683063.zip
-n
forgot that :starttls can also take an SSL_CTX object, and update the documentation
-rw-r--r--openssl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl.c b/openssl.c
index 415b21e..5062b7d 100644
--- a/openssl.c
+++ b/openssl.c
@@ -2986,10 +2986,10 @@ static int sx_new(lua_State *L) {
2986 static const char *opts[] = { 2986 static const char *opts[] = {
2987 "SSLv2", "SSLv3", "SSLv23", "SSL", "TLSv1", "TLS", NULL 2987 "SSLv2", "SSLv3", "SSLv23", "SSL", "TLSv1", "TLS", NULL
2988 }; 2988 };
2989 SSL_CTX **ud = prepsimple(L, SSL_CTX_CLASS);
2990 /* later versions of SSL declare a const qualifier on the return type */ 2989 /* later versions of SSL declare a const qualifier on the return type */
2991 __typeof__(&TLSv1_client_method) method = &TLSv1_client_method; 2990 __typeof__(&TLSv1_client_method) method = &TLSv1_client_method;
2992 _Bool srv; 2991 _Bool srv;
2992 SSL_CTX **ud;
2993 2993
2994 lua_settop(L, 2); 2994 lua_settop(L, 2);
2995 srv = lua_toboolean(L, 2); 2995 srv = lua_toboolean(L, 2);
@@ -3015,6 +3015,8 @@ static int sx_new(lua_State *L) {
3015 break; 3015 break;
3016 } 3016 }
3017 3017
3018 ud = prepsimple(L, SSL_CTX_CLASS);
3019
3018 if (!(*ud = SSL_CTX_new(method()))) 3020 if (!(*ud = SSL_CTX_new(method())))
3019 return throwssl(L, "ssl.context.new"); 3021 return throwssl(L, "ssl.context.new");
3020 3022