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