Fri, 05 Nov 2010 23:11:38 +0000
src/ssl.c: Include x509.h to shush compiler warning
0 | 1 | /*-------------------------------------------------------------------------- |
2 | * LuaSec 0.4 | |
3 | * Copyright (C) 2006-2009 Bruno Silvestre | |
4 | * | |
5 | *--------------------------------------------------------------------------*/ | |
6 | ||
7 | #include <string.h> | |
8 | ||
9 | #include <openssl/ssl.h> | |
11
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
10 | #include <openssl/x509v3.h> |
0 | 11 | #include <openssl/err.h> |
12 | ||
13 | #include <lua.h> | |
14 | #include <lauxlib.h> | |
15 | ||
16 | #include "io.h" | |
17 | #include "buffer.h" | |
18 | #include "timeout.h" | |
19 | #include "socket.h" | |
20 | #include "ssl.h" | |
19
45b7299e4746
src/ssl.c: Include x509.h to shush compiler warning
Matthew Wild <mwild1@gmail.com>
parents:
14
diff
changeset
|
21 | #include "x509.h" |
0 | 22 | |
11
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
23 | #define min(a, b) (a<b)?a:b |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
24 | |
0 | 25 | /** |
26 | * Map error code into string. | |
27 | */ | |
28 | static const char *ssl_ioerror(void *ctx, int err) | |
29 | { | |
30 | if (err == IO_SSL) { | |
31 | p_ssl ssl = (p_ssl) ctx; | |
32 | switch(ssl->error) { | |
33 | case SSL_ERROR_NONE: return "No error"; | |
34 | case SSL_ERROR_ZERO_RETURN: return "closed"; | |
35 | case SSL_ERROR_WANT_READ: return "wantread"; | |
36 | case SSL_ERROR_WANT_WRITE: return "wantwrite"; | |
37 | case SSL_ERROR_WANT_CONNECT: return "'connect' not completed"; | |
38 | case SSL_ERROR_WANT_ACCEPT: return "'accept' not completed"; | |
39 | case SSL_ERROR_WANT_X509_LOOKUP: return "Waiting for callback"; | |
40 | case SSL_ERROR_SYSCALL: return "System error"; | |
41 | case SSL_ERROR_SSL: return ERR_reason_error_string(ERR_get_error()); | |
42 | default: return "Unknown SSL error"; | |
43 | } | |
44 | } | |
45 | return socket_strerror(err); | |
46 | } | |
47 | ||
48 | /** | |
49 | * Close the connection before the GC collect the object. | |
50 | */ | |
51 | static int meth_destroy(lua_State *L) | |
52 | { | |
53 | p_ssl ssl = (p_ssl) lua_touserdata(L, 1); | |
54 | if (ssl->ssl) { | |
55 | socket_setblocking(&ssl->sock); | |
56 | SSL_shutdown(ssl->ssl); | |
57 | socket_destroy(&ssl->sock); | |
58 | SSL_free(ssl->ssl); | |
59 | ssl->ssl = NULL; | |
60 | } | |
61 | return 0; | |
62 | } | |
63 | ||
64 | /** | |
65 | * Perform the TLS/SSL handshake | |
66 | */ | |
67 | static int handshake(p_ssl ssl) | |
68 | { | |
69 | int err; | |
70 | p_timeout tm = timeout_markstart(&ssl->tm); | |
71 | if (ssl->state == ST_SSL_CLOSED) | |
72 | return IO_CLOSED; | |
73 | for ( ; ; ) { | |
74 | ERR_clear_error(); | |
75 | err = SSL_do_handshake(ssl->ssl); | |
76 | ssl->error = SSL_get_error(ssl->ssl, err); | |
77 | switch(ssl->error) { | |
78 | case SSL_ERROR_NONE: | |
79 | ssl->state = ST_SSL_CONNECTED; | |
80 | return IO_DONE; | |
81 | case SSL_ERROR_WANT_READ: | |
82 | err = socket_waitfd(&ssl->sock, WAITFD_R, tm); | |
83 | if (err == IO_TIMEOUT) return IO_SSL; | |
84 | if (err != IO_DONE) return err; | |
85 | break; | |
86 | case SSL_ERROR_WANT_WRITE: | |
87 | err = socket_waitfd(&ssl->sock, WAITFD_W, tm); | |
88 | if (err == IO_TIMEOUT) return IO_SSL; | |
89 | if (err != IO_DONE) return err; | |
90 | break; | |
91 | case SSL_ERROR_SYSCALL: | |
92 | if (ERR_peek_error()) { | |
93 | ssl->error = SSL_ERROR_SSL; | |
94 | return IO_SSL; | |
95 | } | |
96 | if (err == 0) | |
97 | return IO_CLOSED; | |
98 | return socket_error(); | |
99 | default: | |
100 | return IO_SSL; | |
101 | } | |
102 | } | |
103 | return IO_UNKNOWN; | |
104 | } | |
105 | ||
106 | /** | |
107 | * Send data | |
108 | */ | |
109 | static int ssl_send(void *ctx, const char *data, size_t count, size_t *sent, | |
110 | p_timeout tm) | |
111 | { | |
112 | int err; | |
113 | p_ssl ssl = (p_ssl) ctx; | |
114 | if (ssl->state == ST_SSL_CLOSED) | |
115 | return IO_CLOSED; | |
116 | *sent = 0; | |
117 | for ( ; ; ) { | |
118 | ERR_clear_error(); | |
119 | err = SSL_write(ssl->ssl, data, (int) count); | |
120 | ssl->error = SSL_get_error(ssl->ssl, err); | |
121 | switch(ssl->error) { | |
122 | case SSL_ERROR_NONE: | |
123 | *sent = err; | |
124 | return IO_DONE; | |
125 | case SSL_ERROR_WANT_READ: | |
126 | err = socket_waitfd(&ssl->sock, WAITFD_R, tm); | |
127 | if (err == IO_TIMEOUT) return IO_SSL; | |
128 | if (err != IO_DONE) return err; | |
129 | break; | |
130 | case SSL_ERROR_WANT_WRITE: | |
131 | err = socket_waitfd(&ssl->sock, WAITFD_W, tm); | |
132 | if (err == IO_TIMEOUT) return IO_SSL; | |
133 | if (err != IO_DONE) return err; | |
134 | break; | |
135 | case SSL_ERROR_SYSCALL: | |
136 | if (ERR_peek_error()) { | |
137 | ssl->error = SSL_ERROR_SSL; | |
138 | return IO_SSL; | |
139 | } | |
140 | if (err == 0) | |
141 | return IO_CLOSED; | |
142 | return socket_error(); | |
143 | default: | |
144 | return IO_SSL; | |
145 | } | |
146 | } | |
147 | return IO_UNKNOWN; | |
148 | } | |
149 | ||
150 | /** | |
151 | * Receive data | |
152 | */ | |
153 | static int ssl_recv(void *ctx, char *data, size_t count, size_t *got, | |
154 | p_timeout tm) | |
155 | { | |
156 | int err; | |
157 | p_ssl ssl = (p_ssl) ctx; | |
158 | if (ssl->state == ST_SSL_CLOSED) | |
159 | return IO_CLOSED; | |
160 | *got = 0; | |
161 | for ( ; ; ) { | |
162 | ERR_clear_error(); | |
163 | err = SSL_read(ssl->ssl, data, (int) count); | |
164 | ssl->error = SSL_get_error(ssl->ssl, err); | |
165 | switch(ssl->error) { | |
166 | case SSL_ERROR_NONE: | |
167 | *got = err; | |
168 | return IO_DONE; | |
169 | case SSL_ERROR_ZERO_RETURN: | |
170 | *got = err; | |
171 | return IO_CLOSED; | |
172 | case SSL_ERROR_WANT_READ: | |
173 | err = socket_waitfd(&ssl->sock, WAITFD_R, tm); | |
174 | if (err == IO_TIMEOUT) return IO_SSL; | |
175 | if (err != IO_DONE) return err; | |
176 | break; | |
177 | case SSL_ERROR_WANT_WRITE: | |
178 | err = socket_waitfd(&ssl->sock, WAITFD_W, tm); | |
179 | if (err == IO_TIMEOUT) return IO_SSL; | |
180 | if (err != IO_DONE) return err; | |
181 | break; | |
182 | case SSL_ERROR_SYSCALL: | |
183 | if (ERR_peek_error()) { | |
184 | ssl->error = SSL_ERROR_SSL; | |
185 | return IO_SSL; | |
186 | } | |
187 | if (err == 0) | |
188 | return IO_CLOSED; | |
189 | return socket_error(); | |
190 | default: | |
191 | return IO_SSL; | |
192 | } | |
193 | } | |
194 | return IO_UNKNOWN; | |
195 | } | |
196 | ||
197 | /** | |
198 | * Create a new TLS/SSL object and mark it as new. | |
199 | */ | |
200 | static int meth_create(lua_State *L) | |
201 | { | |
202 | p_ssl ssl; | |
203 | int mode = ctx_getmode(L, 1); | |
204 | SSL_CTX *ctx = ctx_getcontext(L, 1); | |
205 | ||
206 | if (mode == MD_CTX_INVALID) { | |
207 | lua_pushnil(L); | |
208 | lua_pushstring(L, "invalid mode"); | |
209 | return 2; | |
210 | } | |
211 | ssl = (p_ssl) lua_newuserdata(L, sizeof(t_ssl)); | |
212 | if (!ssl) { | |
213 | lua_pushnil(L); | |
214 | lua_pushstring(L, "error creating SSL object"); | |
215 | return 2; | |
216 | } | |
217 | ssl->ssl = SSL_new(ctx); | |
218 | if (!ssl->ssl) { | |
219 | lua_pushnil(L); | |
220 | lua_pushstring(L, "error creating SSL object"); | |
221 | return 2;; | |
222 | } | |
223 | ssl->state = ST_SSL_NEW; | |
224 | SSL_set_fd(ssl->ssl, (int) SOCKET_INVALID); | |
2
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
225 | SSL_set_mode(ssl->ssl, SSL_MODE_ENABLE_PARTIAL_WRITE | |
0 | 226 | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); |
2
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
227 | |
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
228 | #ifdef SSL_MODE_RELEASE_BUFFERS |
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
229 | SSL_set_mode(ssl->ssl, SSL_MODE_RELEASE_BUFFERS); |
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
230 | #endif |
0cfca30f1ce3
ssl.c: Set SSL_MODE_RELEASE_BUFFERS mode when supported
Matthew Wild <mwild1@gmail.com>
parents:
0
diff
changeset
|
231 | |
0 | 232 | if (mode == MD_CTX_SERVER) |
233 | SSL_set_accept_state(ssl->ssl); | |
234 | else | |
235 | SSL_set_connect_state(ssl->ssl); | |
236 | ||
237 | io_init(&ssl->io, (p_send) ssl_send, (p_recv) ssl_recv, | |
238 | (p_error) ssl_ioerror, ssl); | |
239 | timeout_init(&ssl->tm, -1, -1); | |
240 | buffer_init(&ssl->buf, &ssl->io, &ssl->tm); | |
241 | ||
242 | luaL_getmetatable(L, "SSL:Connection"); | |
243 | lua_setmetatable(L, -2); | |
244 | return 1; | |
245 | } | |
246 | ||
247 | /** | |
248 | * Buffer send function | |
249 | */ | |
250 | static int meth_send(lua_State *L) { | |
251 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
252 | return buffer_meth_send(L, &ssl->buf); | |
253 | } | |
254 | ||
255 | /** | |
256 | * Buffer receive function | |
257 | */ | |
258 | static int meth_receive(lua_State *L) { | |
259 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
260 | return buffer_meth_receive(L, &ssl->buf); | |
261 | } | |
262 | ||
263 | /** | |
264 | * Select support methods | |
265 | */ | |
266 | static int meth_getfd(lua_State *L) | |
267 | { | |
268 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
269 | lua_pushnumber(L, ssl->sock); | |
270 | return 1; | |
271 | } | |
272 | ||
273 | /** | |
274 | * Set the TLS/SSL file descriptor. | |
275 | * This is done *before* the handshake. | |
276 | */ | |
277 | static int meth_setfd(lua_State *L) | |
278 | { | |
279 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
280 | if (ssl->state != ST_SSL_NEW) | |
281 | luaL_argerror(L, 1, "invalid SSL object state"); | |
282 | ssl->sock = luaL_checkint(L, 2); | |
283 | socket_setnonblocking(&ssl->sock); | |
284 | SSL_set_fd(ssl->ssl, (int)ssl->sock); | |
285 | return 0; | |
286 | } | |
287 | ||
288 | /** | |
289 | * Lua handshake function. | |
290 | */ | |
291 | static int meth_handshake(lua_State *L) | |
292 | { | |
293 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
294 | int err = handshake(ssl); | |
295 | if (err == IO_DONE) { | |
296 | lua_pushboolean(L, 1); | |
297 | return 1; | |
298 | } | |
299 | lua_pushboolean(L, 0); | |
300 | lua_pushstring(L, ssl_ioerror((void*)ssl, err)); | |
301 | return 2; | |
302 | } | |
303 | ||
304 | /** | |
305 | * Close the connection. | |
306 | */ | |
307 | static int meth_close(lua_State *L) | |
308 | { | |
309 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
310 | meth_destroy(L); | |
311 | ssl->state = ST_SSL_CLOSED; | |
312 | return 0; | |
313 | } | |
314 | ||
315 | /** | |
316 | * Set timeout. | |
317 | */ | |
318 | static int meth_settimeout(lua_State *L) | |
319 | { | |
320 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
321 | return timeout_meth_settimeout(L, &ssl->tm); | |
322 | } | |
323 | ||
324 | /** | |
325 | * Check if there is data in the buffer. | |
326 | */ | |
327 | static int meth_dirty(lua_State *L) | |
328 | { | |
329 | int res = 0; | |
330 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
331 | if (ssl->state != ST_SSL_CLOSED) | |
332 | res = !buffer_isempty(&ssl->buf) || SSL_pending(ssl->ssl); | |
333 | lua_pushboolean(L, res); | |
334 | return 1; | |
335 | } | |
336 | ||
337 | /** | |
338 | * Return the state information about the SSL object. | |
339 | */ | |
340 | static int meth_want(lua_State *L) | |
341 | { | |
342 | p_ssl ssl = (p_ssl) luaL_checkudata(L, 1, "SSL:Connection"); | |
343 | int code = (ssl->state == ST_SSL_CLOSED) ? SSL_NOTHING : SSL_want(ssl->ssl); | |
344 | switch(code) { | |
345 | case SSL_NOTHING: lua_pushstring(L, "nothing"); break; | |
346 | case SSL_READING: lua_pushstring(L, "read"); break; | |
347 | case SSL_WRITING: lua_pushstring(L, "write"); break; | |
348 | case SSL_X509_LOOKUP: lua_pushstring(L, "x509lookup"); break; | |
349 | } | |
350 | return 1; | |
351 | } | |
352 | ||
353 | /** | |
354 | * Return a pointer to SSL structure. | |
355 | */ | |
356 | static int meth_rawconn(lua_State *L) | |
357 | { | |
358 | p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); | |
359 | lua_pushlightuserdata(L, (void*)ssl->ssl); | |
360 | return 1; | |
361 | } | |
362 | ||
3
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
363 | /** |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
364 | * Return the compression method used. |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
365 | */ |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
366 | static int meth_compression(lua_State *L) |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
367 | { |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
368 | const COMP_METHOD *comp; |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
369 | p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
370 | comp = SSL_get_current_compression(ssl->ssl); |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
371 | if (comp) { |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
372 | lua_pushstring(L, SSL_COMP_get_name(comp)); |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
373 | return 1; |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
374 | } else { |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
375 | lua_pushboolean(L, 0); |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
376 | return 1; |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
377 | } |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
378 | } |
4
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
379 | |
11
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
380 | void luasec_push_asn1_objname(lua_State* L, ASN1_OBJECT *object, int no_name) |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
381 | { |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
382 | char buffer[256]; |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
383 | int len = OBJ_obj2txt(buffer, sizeof(buffer), object, no_name); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
384 | lua_pushlstring(L, buffer, min(sizeof(buffer),len)); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
385 | } |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
386 | |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
387 | void luasec_push_asn1_string(lua_State* L, ASN1_STRING *string) |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
388 | { |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
389 | if(string) |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
390 | lua_pushlstring(L, (char*)ASN1_STRING_data(string), ASN1_STRING_length(string)); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
391 | else |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
392 | lua_pushnil(L); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
393 | } |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
394 | |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
395 | int luasec_push_subtable(lua_State* L, int idx) |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
396 | { |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
397 | |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
398 | lua_pushvalue(L, -1); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
399 | lua_gettable(L, idx-1); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
400 | |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
401 | if(lua_isnil(L, -1)) |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
402 | { |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
403 | lua_pop(L, 1); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
404 | lua_newtable(L); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
405 | lua_pushvalue(L, -2); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
406 | lua_pushvalue(L, -2); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
407 | lua_settable(L, idx-3); |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
408 | |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
409 | lua_replace(L, -2); /* Replace key with table */ |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
410 | return 1; |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
411 | } |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
412 | lua_replace(L, -2); /* Replace key with table */ |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
413 | return 0; |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
414 | } |
8d7698d3fd26
Refactoring of :getpeercertificate(), support for subjectAltName extensions
Matthew Wild <mwild1@gmail.com>
parents:
10
diff
changeset
|
415 | |
4
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
416 | /** |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
417 | * Return the peer certificate. |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
418 | */ |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
419 | static int meth_getpeercertificate(lua_State *L) |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
420 | { |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
421 | X509 *peer; |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
422 | p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
423 | peer = SSL_get_peer_certificate(ssl->ssl); |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
424 | if (peer == NULL) { |
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
425 | /* No client certificate available */ |
14
1927b7b32faf
Split X509 decoding into a separate module, ssl.x509
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
426 | lua_pushnil(L); |
7
da3cf40976f6
Modify :getpeercertificate() to return a decoded certificate (subject only at the moment)
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
427 | } |
da3cf40976f6
Modify :getpeercertificate() to return a decoded certificate (subject only at the moment)
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
428 | else |
da3cf40976f6
Modify :getpeercertificate() to return a decoded certificate (subject only at the moment)
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
429 | { |
14
1927b7b32faf
Split X509 decoding into a separate module, ssl.x509
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
430 | /* Push metatabled peer */ |
1927b7b32faf
Split X509 decoding into a separate module, ssl.x509
Matthew Wild <mwild1@gmail.com>
parents:
13
diff
changeset
|
431 | luasec_push_x509(L, peer); |
4
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
432 | } |
7
da3cf40976f6
Modify :getpeercertificate() to return a decoded certificate (subject only at the moment)
Matthew Wild <mwild1@gmail.com>
parents:
6
diff
changeset
|
433 | return 1; |
4
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
434 | } |
5
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
435 | |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
436 | static int meth_getfinished(lua_State *L) |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
437 | { |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
438 | p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
439 | SSL *conn = ssl->ssl; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
440 | char *buffer = NULL; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
441 | size_t len = 0; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
442 | if ((len = SSL_get_finished(conn, NULL, 0)) != 0) { |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
443 | buffer = malloc(len); |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
444 | if (buffer == NULL) return 0; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
445 | len = SSL_get_finished(conn, buffer, len); |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
446 | lua_pushlstring(L, buffer, len); |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
447 | free(buffer); |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
448 | return 1; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
449 | } else { |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
450 | return 0; |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
451 | } |
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
452 | } |
6
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
453 | |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
454 | static int meth_getpeerfinished(lua_State *L) |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
455 | { |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
456 | p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
457 | SSL *conn = ssl->ssl; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
458 | char *buffer = NULL; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
459 | size_t len = 0; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
460 | if ((len = SSL_get_peer_finished(conn, NULL, 0)) != 0) { |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
461 | buffer = malloc(len); |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
462 | if (buffer == NULL) return 0; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
463 | len = SSL_get_peer_finished(conn, buffer, len); |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
464 | lua_pushlstring(L, buffer, len); |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
465 | free(buffer); |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
466 | return 1; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
467 | } else { |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
468 | return 0; |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
469 | } |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
470 | } |
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
471 | |
0 | 472 | /*---------------------------------------------------------------------------*/ |
473 | ||
474 | ||
475 | /** | |
476 | * SSL metamethods | |
477 | */ | |
478 | static luaL_Reg meta[] = { | |
3
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
479 | {"close", meth_close}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
480 | {"getfd", meth_getfd}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
481 | {"dirty", meth_dirty}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
482 | {"dohandshake", meth_handshake}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
483 | {"receive", meth_receive}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
484 | {"send", meth_send}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
485 | {"settimeout", meth_settimeout}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
486 | {"want", meth_want}, |
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
487 | {"compression", meth_compression}, |
4
718837c61318
Add :getpeercertificate() method to get peer's certificate
Tobias Markmann <tm@ayena.de>
parents:
3
diff
changeset
|
488 | {"getpeercertificate",meth_getpeercertificate}, |
5
2d5a8f963181
Add :getfinished() method to get local TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
4
diff
changeset
|
489 | {"getfinished", meth_getfinished}, |
6
d559a15eeb40
Add :getpeerfinished() connection method to get peer's TLS Finished message
Tobias Markmann <tm@ayena.de>
parents:
5
diff
changeset
|
490 | {"getpeerfinished", meth_getpeerfinished}, |
3
bd2b1836f0ba
Add :compression() connection method to get the compression method in use (if any)
Tobias Markmann <tm@ayena.de>
parents:
2
diff
changeset
|
491 | {NULL, NULL} |
0 | 492 | }; |
493 | ||
494 | /** | |
495 | * SSL functions | |
496 | */ | |
497 | static luaL_Reg funcs[] = { | |
498 | {"create", meth_create}, | |
499 | {"setfd", meth_setfd}, | |
500 | {"rawconnection", meth_rawconn}, | |
501 | {NULL, NULL} | |
502 | }; | |
503 | ||
504 | /** | |
505 | * Initialize modules | |
506 | */ | |
507 | LUASEC_API int luaopen_ssl_core(lua_State *L) | |
508 | { | |
509 | /* Initialize SSL */ | |
510 | if (!SSL_library_init()) { | |
511 | lua_pushstring(L, "unable to initialize SSL library"); | |
512 | lua_error(L); | |
513 | } | |
514 | SSL_load_error_strings(); | |
515 | ||
516 | /* Initialize internal library */ | |
517 | socket_open(); | |
13
ebe0d286481c
src/ssl.c: Fix minor typo and whitespace
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
518 | |
ebe0d286481c
src/ssl.c: Fix minor typo and whitespace
Matthew Wild <mwild1@gmail.com>
parents:
12
diff
changeset
|
519 | /* Register the functions and tables */ |
0 | 520 | luaL_newmetatable(L, "SSL:Connection"); |
521 | lua_newtable(L); | |
522 | luaL_register(L, NULL, meta); | |
523 | lua_setfield(L, -2, "__index"); | |
524 | lua_pushcfunction(L, meth_destroy); | |
525 | lua_setfield(L, -2, "__gc"); | |
526 | ||
527 | luaL_register(L, "ssl.core", funcs); | |
528 | lua_pushnumber(L, SOCKET_INVALID); | |
529 | lua_setfield(L, -2, "invalidfd"); | |
530 | ||
531 | return 1; | |
532 | } | |
533 |