Mercurial > emacs
annotate src/gnutls.c @ 110878:39b6f8749957
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
According to the documentation, this is correct, and it seems to
make things work.
author | Lars Magne Ingebrigtsen <larsi@gnus.org> |
---|---|
date | Sat, 09 Oct 2010 15:54:57 +0200 |
parents | bb9bf961ba7b |
children | 1ccdcdef34fc |
rev | line source |
---|---|
110584 | 1 /* GnuTLS glue for GNU Emacs. |
2 Copyright (C) 2010 Free Software Foundation, Inc. | |
3 | |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software: you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation, either version 3 of the License, or | |
9 (at your option) any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |
18 | |
19 #include <config.h> | |
20 #include <errno.h> | |
21 #include <setjmp.h> | |
22 | |
23 #include "lisp.h" | |
24 #include "process.h" | |
25 | |
26 #ifdef HAVE_GNUTLS | |
27 #include <gnutls/gnutls.h> | |
28 | |
29 Lisp_Object Qgnutls_code; | |
30 Lisp_Object Qgnutls_anon, Qgnutls_x509pki; | |
31 Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again, | |
32 Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake; | |
33 int global_initialized; | |
34 | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
35 /* The following are for the property list of `gnutls-boot'. */ |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
36 Lisp_Object Qgnutls_bootprop_priority; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
37 Lisp_Object Qgnutls_bootprop_trustfiles; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
38 Lisp_Object Qgnutls_bootprop_keyfiles; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
39 Lisp_Object Qgnutls_bootprop_callbacks; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
40 Lisp_Object Qgnutls_bootprop_loglevel; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
41 |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
42 static void |
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
43 emacs_gnutls_handshake (struct Lisp_Process *proc) |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
44 { |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
45 gnutls_session_t state = proc->gnutls_state; |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
46 int ret; |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
47 |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
48 if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO) |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
49 return; |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
50 |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
51 if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
52 { |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
53 /* This is how GnuTLS takes sockets: as file descriptors passed |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
54 in. For an Emacs process socket, infd and outfd are the |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
55 same but we use this two-argument version for clarity. */ |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
56 gnutls_transport_set_ptr2 (state, |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
57 (gnutls_transport_ptr_t) (long) proc->infd, |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
58 (gnutls_transport_ptr_t) (long) proc->outfd); |
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
59 |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
60 proc->gnutls_initstage = GNUTLS_STAGE_TRANSPORT_POINTERS_SET; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
61 } |
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
62 |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
63 ret = gnutls_handshake (state); |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
64 proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED; |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
65 |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
66 if (ret == GNUTLS_E_SUCCESS) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
67 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
68 /* here we're finally done. */ |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
69 proc->gnutls_initstage = GNUTLS_STAGE_READY; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
70 } |
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
71 } |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
72 |
110584 | 73 int |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
74 emacs_gnutls_write (int fildes, struct Lisp_Process *proc, char *buf, |
110584 | 75 unsigned int nbyte) |
76 { | |
77 register int rtnval, bytes_written; | |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
78 gnutls_session_t state = proc->gnutls_state; |
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
79 |
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
80 if (proc->gnutls_initstage != GNUTLS_STAGE_READY) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
81 return -1; |
110584 | 82 |
83 bytes_written = 0; | |
84 | |
85 while (nbyte > 0) | |
86 { | |
87 rtnval = gnutls_write (state, buf, nbyte); | |
88 | |
110878
39b6f8749957
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110875
diff
changeset
|
89 if (rtnval < 0) |
110584 | 90 { |
110878
39b6f8749957
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110875
diff
changeset
|
91 if (rtnval == GNUTLS_E_AGAIN || rtnval == GNUTLS_E_INTERRUPTED) |
110584 | 92 continue; |
93 else | |
94 return (bytes_written ? bytes_written : -1); | |
95 } | |
96 | |
97 buf += rtnval; | |
98 nbyte -= rtnval; | |
99 bytes_written += rtnval; | |
100 } | |
101 | |
102 return (bytes_written); | |
103 } | |
104 | |
105 int | |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
106 emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, |
110584 | 107 unsigned int nbyte) |
108 { | |
109 register int rtnval; | |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
110 gnutls_session_t state = proc->gnutls_state; |
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
111 |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
112 if (proc->gnutls_initstage != GNUTLS_STAGE_READY) |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
113 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
114 emacs_gnutls_handshake (proc); |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
115 return -1; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
116 } |
110584 | 117 |
110608
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
118 rtnval = gnutls_read (state, buf, nbyte); |
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
119 if (rtnval >= 0) |
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
120 return rtnval; |
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
121 else |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
122 return -1; |
110584 | 123 } |
124 | |
125 /* convert an integer error to a Lisp_Object; it will be either a | |
126 known symbol like `gnutls_e_interrupted' and `gnutls_e_again' or | |
127 simply the integer value of the error. GNUTLS_E_SUCCESS is mapped | |
128 to Qt. */ | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
129 static Lisp_Object |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
130 gnutls_make_error (int error) |
110584 | 131 { |
132 switch (error) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
133 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
134 case GNUTLS_E_SUCCESS: |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
135 return Qt; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
136 case GNUTLS_E_AGAIN: |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
137 return Qgnutls_e_again; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
138 case GNUTLS_E_INTERRUPTED: |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
139 return Qgnutls_e_interrupted; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
140 case GNUTLS_E_INVALID_SESSION: |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
141 return Qgnutls_e_invalid_session; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
142 } |
110584 | 143 |
144 return make_number (error); | |
145 } | |
146 | |
147 DEFUN ("gnutls-get-initstage", Fgnutls_get_initstage, Sgnutls_get_initstage, 1, 1, 0, | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
148 doc: /* Return the GnuTLS init stage of process PROC. |
110584 | 149 See also `gnutls-boot'. */) |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
150 (Lisp_Object proc) |
110584 | 151 { |
152 CHECK_PROCESS (proc); | |
153 | |
154 return make_number (GNUTLS_INITSTAGE (proc)); | |
155 } | |
156 | |
157 DEFUN ("gnutls-errorp", Fgnutls_errorp, Sgnutls_errorp, 1, 1, 0, | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
158 doc: /* Return t if ERROR indicates a GnuTLS problem. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
159 ERROR is an integer or a symbol with an integer `gnutls-code' property. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
160 usage: (gnutls-errorp ERROR) */) |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
161 (Lisp_Object err) |
110584 | 162 { |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
163 if (EQ (err, Qt)) return Qnil; |
110584 | 164 |
165 return Qt; | |
166 } | |
167 | |
168 DEFUN ("gnutls-error-fatalp", Fgnutls_error_fatalp, Sgnutls_error_fatalp, 1, 1, 0, | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
169 doc: /* Check if ERROR is fatal. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
170 ERROR is an integer or a symbol with an integer `gnutls-code' property. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
171 usage: (gnutls-error-fatalp ERROR) */) |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
172 (Lisp_Object err) |
110584 | 173 { |
174 Lisp_Object code; | |
175 | |
176 if (EQ (err, Qt)) return Qnil; | |
177 | |
178 if (SYMBOLP (err)) | |
179 { | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
180 code = Fget (err, Qgnutls_code); |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
181 if (NUMBERP (code)) |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
182 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
183 err = code; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
184 } |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
185 else |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
186 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
187 error ("Symbol has no numeric gnutls-code property"); |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
188 } |
110584 | 189 } |
190 | |
191 if (!NUMBERP (err)) | |
192 error ("Not an error symbol or code"); | |
193 | |
194 if (0 == gnutls_error_is_fatal (XINT (err))) | |
195 return Qnil; | |
196 | |
197 return Qt; | |
198 } | |
199 | |
200 DEFUN ("gnutls-error-string", Fgnutls_error_string, Sgnutls_error_string, 1, 1, 0, | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
201 doc: /* Return a description of ERROR. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
202 ERROR is an integer or a symbol with an integer `gnutls-code' property. |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
203 usage: (gnutls-error-string ERROR) */) |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
204 (Lisp_Object err) |
110584 | 205 { |
206 Lisp_Object code; | |
207 | |
208 if (EQ (err, Qt)) return build_string ("Not an error"); | |
209 | |
210 if (SYMBOLP (err)) | |
211 { | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
212 code = Fget (err, Qgnutls_code); |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
213 if (NUMBERP (code)) |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
214 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
215 err = code; |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
216 } |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
217 else |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
218 { |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
219 return build_string ("Symbol has no numeric gnutls-code property"); |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
220 } |
110584 | 221 } |
222 | |
223 if (!NUMBERP (err)) | |
224 return build_string ("Not an error symbol or code"); | |
225 | |
226 return build_string (gnutls_strerror (XINT (err))); | |
227 } | |
228 | |
229 DEFUN ("gnutls-deinit", Fgnutls_deinit, Sgnutls_deinit, 1, 1, 0, | |
110728
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
230 doc: /* Deallocate GnuTLS resources associated with process PROC. |
110584 | 231 See also `gnutls-init'. */) |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
232 (Lisp_Object proc) |
110584 | 233 { |
234 gnutls_session_t state; | |
235 | |
236 CHECK_PROCESS (proc); | |
237 state = XPROCESS (proc)->gnutls_state; | |
238 | |
239 if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
240 { |
110584 | 241 gnutls_deinit (state); |
242 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1; | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
243 } |
110584 | 244 |
245 return Qt; | |
246 } | |
247 | |
110728
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
248 /* Initializes global GnuTLS state to defaults. |
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
249 Call `gnutls-global-deinit' when GnuTLS usage is no longer needed. |
110584 | 250 Returns zero on success. */ |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
251 static Lisp_Object |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
252 gnutls_emacs_global_init (void) |
110584 | 253 { |
254 int ret = GNUTLS_E_SUCCESS; | |
255 | |
256 if (!global_initialized) | |
257 ret = gnutls_global_init (); | |
258 | |
259 global_initialized = 1; | |
260 | |
261 return gnutls_make_error (ret); | |
262 } | |
263 | |
110728
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
264 /* Deinitializes global GnuTLS state. |
110584 | 265 See also `gnutls-global-init'. */ |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
266 static Lisp_Object |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
267 gnutls_emacs_global_deinit (void) |
110584 | 268 { |
269 if (global_initialized) | |
270 gnutls_global_deinit (); | |
271 | |
272 global_initialized = 0; | |
273 | |
274 return gnutls_make_error (GNUTLS_E_SUCCESS); | |
275 } | |
276 | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
277 static void |
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
278 gnutls_log_function (int level, const char* string) |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
279 { |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
280 message ("gnutls.c: [%d] %s", level, string); |
110606
b4f4c3e9b976
Add debugging to the gnutls library, and finish handshaking when it's done.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110584
diff
changeset
|
281 } |
b4f4c3e9b976
Add debugging to the gnutls library, and finish handshaking when it's done.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110584
diff
changeset
|
282 |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
283 static void |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
284 gnutls_log_function2 (int level, const char* string, const char* extra) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
285 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
286 message ("gnutls.c: [%d] %s %s", level, string, extra); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
287 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
288 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
289 DEFUN ("gnutls-boot", Fgnutls_boot, Sgnutls_boot, 3, 3, 0, |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
290 doc: /* Initialize GnuTLS client for process PROC with TYPE+PROPLIST. |
110584 | 291 Currently only client mode is supported. Returns a success/failure |
292 value you can check with `gnutls-errorp'. | |
293 | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
294 TYPE is a symbol, either `gnutls-anon' or `gnutls-x509pki'. |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
295 PROPLIST is a property list with the following keys: |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
296 |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
297 :priority is a GnuTLS priority string, defaults to "NORMAL". |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
298 :trustfiles is a list of PEM-encoded trust files for `gnutls-x509pki'. |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
299 :keyfiles is a list of PEM-encoded key files for `gnutls-x509pki'. |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
300 :callbacks is an alist of callback functions (TODO). |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
301 :loglevel is the debug level requested from GnuTLS, try 4. |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
302 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
303 The debug level will be set for this process AND globally for GnuTLS. |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
304 So if you set it higher or lower at any point, it affects global |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
305 debugging. |
110584 | 306 |
307 Note that the priority is set on the client. The server does not use | |
308 the protocols's priority except for disabling protocols that were not | |
309 specified. | |
310 | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
311 Processes must be initialized with this function before other GnuTLS |
110584 | 312 functions are used. This function allocates resources which can only |
313 be deallocated by calling `gnutls-deinit' or by calling it again. | |
314 | |
315 Each authentication type may need additional information in order to | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
316 work. For X.509 PKI (`gnutls-x509pki'), you probably need at least |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
317 one trustfile (usually a CA bundle). */) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
318 (Lisp_Object proc, Lisp_Object type, Lisp_Object proplist) |
110584 | 319 { |
320 int ret = GNUTLS_E_SUCCESS; | |
321 | |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
322 int max_log_level = 0; |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
323 |
110584 | 324 /* TODO: GNUTLS_X509_FMT_DER is also an option. */ |
325 int file_format = GNUTLS_X509_FMT_PEM; | |
326 | |
327 gnutls_session_t state; | |
328 gnutls_certificate_credentials_t x509_cred; | |
329 gnutls_anon_client_credentials_t anon_cred; | |
330 Lisp_Object global_init; | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
331 char* priority_string_ptr = "NORMAL"; /* default priority string. */ |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
332 Lisp_Object tail; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
333 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
334 /* Placeholders for the property list elements. */ |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
335 Lisp_Object priority_string; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
336 Lisp_Object trustfiles; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
337 Lisp_Object keyfiles; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
338 Lisp_Object callbacks; |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
339 Lisp_Object loglevel; |
110584 | 340 |
341 CHECK_PROCESS (proc); | |
342 CHECK_SYMBOL (type); | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
343 CHECK_LIST (proplist); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
344 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
345 priority_string = Fplist_get (proplist, Qgnutls_bootprop_priority); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
346 trustfiles = Fplist_get (proplist, Qgnutls_bootprop_trustfiles); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
347 keyfiles = Fplist_get (proplist, Qgnutls_bootprop_keyfiles); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
348 callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
349 loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel); |
110584 | 350 |
351 state = XPROCESS (proc)->gnutls_state; | |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
352 XPROCESS (proc)->gnutls_p = 1; |
110584 | 353 |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
354 if (NUMBERP (loglevel)) |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
355 { |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
356 gnutls_global_set_log_function (gnutls_log_function); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
357 gnutls_global_set_log_level (XINT (loglevel)); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
358 max_log_level = XINT (loglevel); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
359 XPROCESS (proc)->gnutls_log_level = max_log_level; |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
360 } |
110648
256dd50b2a63
Make sure all reads/writes to gnutls streams go via the gnutls functions.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110636
diff
changeset
|
361 |
110584 | 362 /* always initialize globals. */ |
363 global_init = gnutls_emacs_global_init (); | |
364 if (! NILP (Fgnutls_errorp (global_init))) | |
365 return global_init; | |
366 | |
367 /* deinit and free resources. */ | |
368 if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_CRED_ALLOC) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
369 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
370 GNUTLS_LOG (1, max_log_level, "deallocating credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
371 |
110584 | 372 if (EQ (type, Qgnutls_x509pki)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
373 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
374 GNUTLS_LOG (2, max_log_level, "deallocating x509 credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
375 x509_cred = XPROCESS (proc)->gnutls_x509_cred; |
110584 | 376 gnutls_certificate_free_credentials (x509_cred); |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
377 } |
110584 | 378 else if (EQ (type, Qgnutls_anon)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
379 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
380 GNUTLS_LOG (2, max_log_level, "deallocating anon credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
381 anon_cred = XPROCESS (proc)->gnutls_anon_cred; |
110584 | 382 gnutls_anon_free_client_credentials (anon_cred); |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
383 } |
110584 | 384 else |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
385 { |
110584 | 386 error ("unknown credential type"); |
387 ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
388 } |
110584 | 389 |
390 if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
391 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
392 GNUTLS_LOG (1, max_log_level, "deallocating x509 credentials"); |
110584 | 393 Fgnutls_deinit (proc); |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
394 } |
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
395 } |
110584 | 396 |
397 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_EMPTY; | |
398 | |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
399 GNUTLS_LOG (1, max_log_level, "allocating credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
400 |
110584 | 401 if (EQ (type, Qgnutls_x509pki)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
402 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
403 GNUTLS_LOG (2, max_log_level, "allocating x509 credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
404 x509_cred = XPROCESS (proc)->gnutls_x509_cred; |
110584 | 405 if (gnutls_certificate_allocate_credentials (&x509_cred) < 0) |
406 memory_full (); | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
407 } |
110584 | 408 else if (EQ (type, Qgnutls_anon)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
409 { |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
410 GNUTLS_LOG (2, max_log_level, "allocating anon credentials"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
411 anon_cred = XPROCESS (proc)->gnutls_anon_cred; |
110584 | 412 if (gnutls_anon_allocate_client_credentials (&anon_cred) < 0) |
413 memory_full (); | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
414 } |
110584 | 415 else |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
416 { |
110584 | 417 error ("unknown credential type"); |
418 ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
419 } |
110584 | 420 |
421 if (ret < GNUTLS_E_SUCCESS) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
422 return gnutls_make_error (ret); |
110584 | 423 |
424 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_ALLOC; | |
425 | |
426 if (EQ (type, Qgnutls_x509pki)) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
427 { |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
428 for (tail = trustfiles; !NILP (tail); tail = Fcdr (tail)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
429 { |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
430 Lisp_Object trustfile = Fcar (tail); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
431 if (STRINGP (trustfile)) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
432 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
433 GNUTLS_LOG2 (1, max_log_level, "setting the trustfile: ", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
434 SDATA (trustfile)); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
435 ret = gnutls_certificate_set_x509_trust_file |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
436 (x509_cred, |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
437 SDATA (trustfile), |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
438 file_format); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
439 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
440 if (ret < GNUTLS_E_SUCCESS) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
441 return gnutls_make_error (ret); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
442 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
443 else |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
444 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
445 error ("Sorry, GnuTLS can't use non-string trustfile %s", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
446 trustfile); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
447 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
448 } |
110584 | 449 |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
450 for (tail = keyfiles; !NILP (tail); tail = Fcdr (tail)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
451 { |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
452 Lisp_Object keyfile = Fcar (tail); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
453 if (STRINGP (keyfile)) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
454 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
455 GNUTLS_LOG2 (1, max_log_level, "setting the keyfile: ", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
456 SDATA (keyfile)); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
457 ret = gnutls_certificate_set_x509_crl_file |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
458 (x509_cred, |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
459 SDATA (keyfile), |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
460 file_format); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
461 |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
462 if (ret < GNUTLS_E_SUCCESS) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
463 return gnutls_make_error (ret); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
464 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
465 else |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
466 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
467 error ("Sorry, GnuTLS can't use non-string keyfile %s", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
468 keyfile); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
469 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
470 } |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
471 } |
110584 | 472 |
473 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_FILES; | |
474 | |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
475 GNUTLS_LOG (1, max_log_level, "gnutls_init"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
476 |
110584 | 477 ret = gnutls_init (&state, GNUTLS_CLIENT); |
478 | |
479 if (ret < GNUTLS_E_SUCCESS) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
480 return gnutls_make_error (ret); |
110584 | 481 |
482 XPROCESS (proc)->gnutls_state = state; | |
483 | |
484 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT; | |
485 | |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
486 if (STRINGP (priority_string)) |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
487 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
488 priority_string_ptr = (char*) SDATA (priority_string); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
489 GNUTLS_LOG2 (1, max_log_level, "got non-default priority string:", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
490 priority_string_ptr); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
491 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
492 else |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
493 { |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
494 GNUTLS_LOG2 (1, max_log_level, "using default priority string:", |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
495 priority_string_ptr); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
496 } |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
497 |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
498 GNUTLS_LOG (1, max_log_level, "setting the priority string"); |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
499 |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
500 ret = gnutls_priority_set_direct (state, |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
501 priority_string_ptr, |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
502 NULL); |
110584 | 503 |
504 if (ret < GNUTLS_E_SUCCESS) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
505 return gnutls_make_error (ret); |
110584 | 506 |
507 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_PRIORITY; | |
508 | |
509 if (EQ (type, Qgnutls_x509pki)) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
510 { |
110584 | 511 ret = gnutls_cred_set (state, GNUTLS_CRD_CERTIFICATE, x509_cred); |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
512 } |
110584 | 513 else if (EQ (type, Qgnutls_anon)) |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
514 { |
110584 | 515 ret = gnutls_cred_set (state, GNUTLS_CRD_ANON, anon_cred); |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
516 } |
110584 | 517 else |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
518 { |
110584 | 519 error ("unknown credential type"); |
520 ret = GNUTLS_EMACS_ERROR_INVALID_TYPE; | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
521 } |
110584 | 522 |
523 if (ret < GNUTLS_E_SUCCESS) | |
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
524 return gnutls_make_error (ret); |
110584 | 525 |
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
526 XPROCESS (proc)->gnutls_anon_cred = anon_cred; |
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
527 XPROCESS (proc)->gnutls_x509_cred = x509_cred; |
110584 | 528 XPROCESS (proc)->gnutls_cred_type = type; |
529 | |
530 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; | |
531 | |
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
532 emacs_gnutls_handshake (XPROCESS (proc)); |
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
533 |
110584 | 534 return gnutls_make_error (GNUTLS_E_SUCCESS); |
535 } | |
536 | |
537 DEFUN ("gnutls-bye", Fgnutls_bye, | |
538 Sgnutls_bye, 2, 2, 0, | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
539 doc: /* Terminate current GnuTLS connection for process PROC. |
110584 | 540 The connection should have been initiated using `gnutls-handshake'. |
541 | |
542 If CONT is not nil the TLS connection gets terminated and further | |
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
543 receives and sends will be disallowed. If the return value is zero you |
110584 | 544 may continue using the connection. If CONT is nil, GnuTLS actually |
545 sends an alert containing a close request and waits for the peer to | |
546 reply with the same message. In order to reuse the connection you | |
547 should wait for an EOF from the peer. | |
548 | |
549 This function may also return `gnutls-e-again', or | |
550 `gnutls-e-interrupted'. */) | |
551 (Lisp_Object proc, Lisp_Object cont) | |
552 { | |
553 gnutls_session_t state; | |
554 int ret; | |
555 | |
556 CHECK_PROCESS (proc); | |
557 | |
558 state = XPROCESS (proc)->gnutls_state; | |
559 | |
560 ret = gnutls_bye (state, | |
561 NILP (cont) ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR); | |
562 | |
563 return gnutls_make_error (ret); | |
564 } | |
565 | |
566 void | |
567 syms_of_gnutls (void) | |
568 { | |
569 global_initialized = 0; | |
570 | |
571 Qgnutls_code = intern_c_string ("gnutls-code"); | |
572 staticpro (&Qgnutls_code); | |
573 | |
574 Qgnutls_anon = intern_c_string ("gnutls-anon"); | |
575 staticpro (&Qgnutls_anon); | |
576 | |
577 Qgnutls_x509pki = intern_c_string ("gnutls-x509pki"); | |
578 staticpro (&Qgnutls_x509pki); | |
579 | |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
580 Qgnutls_bootprop_priority = intern_c_string (":priority"); |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
581 staticpro (&Qgnutls_bootprop_priority); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
582 |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
583 Qgnutls_bootprop_trustfiles = intern_c_string (":trustfiles"); |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
584 staticpro (&Qgnutls_bootprop_trustfiles); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
585 |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
586 Qgnutls_bootprop_keyfiles = intern_c_string (":keyfiles"); |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
587 staticpro (&Qgnutls_bootprop_keyfiles); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
588 |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
589 Qgnutls_bootprop_callbacks = intern_c_string (":callbacks"); |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
590 staticpro (&Qgnutls_bootprop_callbacks); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
591 |
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
592 Qgnutls_bootprop_loglevel = intern_c_string (":loglevel"); |
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
593 staticpro (&Qgnutls_bootprop_loglevel); |
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
594 |
110584 | 595 Qgnutls_e_interrupted = intern_c_string ("gnutls-e-interrupted"); |
596 staticpro (&Qgnutls_e_interrupted); | |
597 Fput (Qgnutls_e_interrupted, Qgnutls_code, | |
598 make_number (GNUTLS_E_INTERRUPTED)); | |
599 | |
600 Qgnutls_e_again = intern_c_string ("gnutls-e-again"); | |
601 staticpro (&Qgnutls_e_again); | |
602 Fput (Qgnutls_e_again, Qgnutls_code, | |
603 make_number (GNUTLS_E_AGAIN)); | |
604 | |
605 Qgnutls_e_invalid_session = intern_c_string ("gnutls-e-invalid-session"); | |
606 staticpro (&Qgnutls_e_invalid_session); | |
607 Fput (Qgnutls_e_invalid_session, Qgnutls_code, | |
608 make_number (GNUTLS_E_INVALID_SESSION)); | |
609 | |
610 Qgnutls_e_not_ready_for_handshake = | |
611 intern_c_string ("gnutls-e-not-ready-for-handshake"); | |
612 staticpro (&Qgnutls_e_not_ready_for_handshake); | |
613 Fput (Qgnutls_e_not_ready_for_handshake, Qgnutls_code, | |
614 make_number (GNUTLS_E_APPLICATION_ERROR_MIN)); | |
615 | |
616 defsubr (&Sgnutls_get_initstage); | |
617 defsubr (&Sgnutls_errorp); | |
618 defsubr (&Sgnutls_error_fatalp); | |
619 defsubr (&Sgnutls_error_string); | |
620 defsubr (&Sgnutls_boot); | |
621 defsubr (&Sgnutls_deinit); | |
622 defsubr (&Sgnutls_bye); | |
623 } | |
624 #endif |