Mercurial > emacs
annotate src/gnutls.c @ 112453:06719a229a46 default tip
* calc/calc.el (calc-default-power-reference-level)
(calc-default-field-reference-level): New variables.
* calc/calc-units.el (math-standard-units): Add dB and Np.
(math-logunits): New variable.
(math-extract-logunits, math-logcombine, calcFunc-luplus)
(calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level)
(calcFunc-fieldlevel, calcFunc-powerlevel, calc-level): New
functions.
(math-find-base-units-rec): Add entry for ln(10).
* calc/calc-help.el (calc-u-prefix-help): Add logarithmic help.
(calc-ul-prefix-help): New function.
* calc/calc-ext.el (calc-init-extensions): Autoload new units
functions. Add keybindings for new units functions.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Sun, 23 Jan 2011 23:08:04 -0600 |
| parents | 9de5a68b57e1 |
| children |
| rev | line source |
|---|---|
| 110584 | 1 /* GnuTLS glue for GNU Emacs. |
|
112275
6378d1b57038
Add 2011 to remaining FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
111025
diff
changeset
|
2 Copyright (C) 2010, 2011 Free Software Foundation, Inc. |
| 110584 | 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 |
|
110907
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
80 if (proc->gnutls_initstage != GNUTLS_STAGE_READY) { |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
81 #ifdef EWOULDBLOCK |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
82 errno = EWOULDBLOCK; |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
83 #endif |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
84 #ifdef EAGAIN |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
85 errno = EAGAIN; |
|
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
86 #endif |
|
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
87 return -1; |
|
110907
1ccdcdef34fc
Fix gnutls write-before-negotiation case.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110878
diff
changeset
|
88 } |
| 110584 | 89 |
| 90 bytes_written = 0; | |
| 91 | |
| 92 while (nbyte > 0) | |
| 93 { | |
| 94 rtnval = gnutls_write (state, buf, nbyte); | |
| 95 | |
|
110878
39b6f8749957
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110875
diff
changeset
|
96 if (rtnval < 0) |
| 110584 | 97 { |
|
110878
39b6f8749957
(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110875
diff
changeset
|
98 if (rtnval == GNUTLS_E_AGAIN || rtnval == GNUTLS_E_INTERRUPTED) |
| 110584 | 99 continue; |
| 100 else | |
| 101 return (bytes_written ? bytes_written : -1); | |
| 102 } | |
| 103 | |
| 104 buf += rtnval; | |
| 105 nbyte -= rtnval; | |
| 106 bytes_written += rtnval; | |
| 107 } | |
| 108 | |
| 109 return (bytes_written); | |
| 110 } | |
| 111 | |
| 112 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
|
113 emacs_gnutls_read (int fildes, struct Lisp_Process *proc, char *buf, |
| 110584 | 114 unsigned int nbyte) |
| 115 { | |
| 116 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
|
117 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
|
118 |
|
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
119 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
|
120 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
121 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
|
122 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
|
123 } |
| 110584 | 124 |
|
110608
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
125 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
|
126 if (rtnval >= 0) |
|
06497cf3e920
(emacs_gnutls_read): Don't infloop while reading.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110606
diff
changeset
|
127 return rtnval; |
|
111025
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
128 else { |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
129 if (rtnval == GNUTLS_E_AGAIN || |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
130 rtnval == GNUTLS_E_INTERRUPTED) |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
131 return -1; |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
132 else |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
133 return 0; |
|
54ea07fb88fc
(emacs_gnutls_read): Return 0 if we get a non-"EAGAIN"-like error to signal to Emacs that the socket should be closed.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110907
diff
changeset
|
134 } |
| 110584 | 135 } |
| 136 | |
| 137 /* convert an integer error to a Lisp_Object; it will be either a | |
| 138 known symbol like `gnutls_e_interrupted' and `gnutls_e_again' or | |
| 139 simply the integer value of the error. GNUTLS_E_SUCCESS is mapped | |
| 140 to Qt. */ | |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
141 static Lisp_Object |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
142 gnutls_make_error (int error) |
| 110584 | 143 { |
| 144 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
|
145 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
146 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
|
147 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
|
148 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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 } |
| 110584 | 155 |
| 156 return make_number (error); | |
| 157 } | |
| 158 | |
| 159 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
|
160 doc: /* Return the GnuTLS init stage of process PROC. |
| 110584 | 161 See also `gnutls-boot'. */) |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
162 (Lisp_Object proc) |
| 110584 | 163 { |
| 164 CHECK_PROCESS (proc); | |
| 165 | |
| 166 return make_number (GNUTLS_INITSTAGE (proc)); | |
| 167 } | |
| 168 | |
| 169 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
|
170 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
|
171 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
|
172 usage: (gnutls-errorp ERROR) */) |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
173 (Lisp_Object err) |
| 110584 | 174 { |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
175 if (EQ (err, Qt)) return Qnil; |
| 110584 | 176 |
| 177 return Qt; | |
| 178 } | |
| 179 | |
| 180 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
|
181 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
|
182 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
|
183 usage: (gnutls-error-fatalp ERROR) */) |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
184 (Lisp_Object err) |
| 110584 | 185 { |
| 186 Lisp_Object code; | |
| 187 | |
| 188 if (EQ (err, Qt)) return Qnil; | |
| 189 | |
| 190 if (SYMBOLP (err)) | |
| 191 { | |
|
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
192 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
|
193 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
|
194 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
195 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
|
196 } |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
197 else |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
198 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
199 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
|
200 } |
| 110584 | 201 } |
| 202 | |
| 203 if (!NUMBERP (err)) | |
| 204 error ("Not an error symbol or code"); | |
| 205 | |
| 206 if (0 == gnutls_error_is_fatal (XINT (err))) | |
| 207 return Qnil; | |
| 208 | |
| 209 return Qt; | |
| 210 } | |
| 211 | |
| 212 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
|
213 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
|
214 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
|
215 usage: (gnutls-error-string ERROR) */) |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
216 (Lisp_Object err) |
| 110584 | 217 { |
| 218 Lisp_Object code; | |
| 219 | |
| 220 if (EQ (err, Qt)) return build_string ("Not an error"); | |
| 221 | |
| 222 if (SYMBOLP (err)) | |
| 223 { | |
|
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
224 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
|
225 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
|
226 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
227 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
|
228 } |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
229 else |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
230 { |
|
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
231 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
|
232 } |
| 110584 | 233 } |
| 234 | |
| 235 if (!NUMBERP (err)) | |
| 236 return build_string ("Not an error symbol or code"); | |
| 237 | |
| 238 return build_string (gnutls_strerror (XINT (err))); | |
| 239 } | |
| 240 | |
| 241 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
|
242 doc: /* Deallocate GnuTLS resources associated with process PROC. |
| 110584 | 243 See also `gnutls-init'. */) |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
244 (Lisp_Object proc) |
| 110584 | 245 { |
| 246 gnutls_session_t state; | |
| 247 | |
| 248 CHECK_PROCESS (proc); | |
| 249 state = XPROCESS (proc)->gnutls_state; | |
| 250 | |
| 251 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
|
252 { |
| 110584 | 253 gnutls_deinit (state); |
| 254 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
|
255 } |
| 110584 | 256 |
| 257 return Qt; | |
| 258 } | |
| 259 | |
|
110728
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
260 /* Initializes global GnuTLS state to defaults. |
|
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
261 Call `gnutls-global-deinit' when GnuTLS usage is no longer needed. |
| 110584 | 262 Returns zero on success. */ |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
263 static Lisp_Object |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
264 gnutls_emacs_global_init (void) |
| 110584 | 265 { |
| 266 int ret = GNUTLS_E_SUCCESS; | |
| 267 | |
| 268 if (!global_initialized) | |
| 269 ret = gnutls_global_init (); | |
| 270 | |
| 271 global_initialized = 1; | |
| 272 | |
| 273 return gnutls_make_error (ret); | |
| 274 } | |
| 275 | |
|
110728
ab7396ada96a
src/gnutls.c: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
110724
diff
changeset
|
276 /* Deinitializes global GnuTLS state. |
| 110584 | 277 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
|
278 static Lisp_Object |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
279 gnutls_emacs_global_deinit (void) |
| 110584 | 280 { |
| 281 if (global_initialized) | |
| 282 gnutls_global_deinit (); | |
| 283 | |
| 284 global_initialized = 0; | |
| 285 | |
| 286 return gnutls_make_error (GNUTLS_E_SUCCESS); | |
| 287 } | |
| 288 | |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
289 static void |
|
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
290 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
|
291 { |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
292 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
|
293 } |
|
b4f4c3e9b976
Add debugging to the gnutls library, and finish handshaking when it's done.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110584
diff
changeset
|
294 |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
295 static void |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
296 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
|
297 { |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
298 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
|
299 } |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
300 |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
301 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
|
302 doc: /* Initialize GnuTLS client for process PROC with TYPE+PROPLIST. |
| 110584 | 303 Currently only client mode is supported. Returns a success/failure |
| 304 value you can check with `gnutls-errorp'. | |
| 305 | |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
306 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
|
307 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
|
308 |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
309 :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
|
310 :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
|
311 :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
|
312 :callbacks is an alist of callback functions (TODO). |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
313 :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
|
314 |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
315 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
|
316 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
|
317 debugging. |
| 110584 | 318 |
| 319 Note that the priority is set on the client. The server does not use | |
| 320 the protocols's priority except for disabling protocols that were not | |
| 321 specified. | |
| 322 | |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
323 Processes must be initialized with this function before other GnuTLS |
| 110584 | 324 functions are used. This function allocates resources which can only |
| 325 be deallocated by calling `gnutls-deinit' or by calling it again. | |
| 326 | |
| 327 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
|
328 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
|
329 one trustfile (usually a CA bundle). */) |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
330 (Lisp_Object proc, Lisp_Object type, Lisp_Object proplist) |
| 110584 | 331 { |
| 332 int ret = GNUTLS_E_SUCCESS; | |
| 333 | |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
334 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
|
335 |
| 110584 | 336 /* TODO: GNUTLS_X509_FMT_DER is also an option. */ |
| 337 int file_format = GNUTLS_X509_FMT_PEM; | |
| 338 | |
| 339 gnutls_session_t state; | |
| 340 gnutls_certificate_credentials_t x509_cred; | |
| 341 gnutls_anon_client_credentials_t anon_cred; | |
| 342 Lisp_Object global_init; | |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
343 char* priority_string_ptr = "NORMAL"; /* default priority string. */ |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
344 Lisp_Object tail; |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
345 |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
346 /* Placeholders for the property list elements. */ |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
347 Lisp_Object priority_string; |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
348 Lisp_Object trustfiles; |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
349 Lisp_Object keyfiles; |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
350 Lisp_Object callbacks; |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
351 Lisp_Object loglevel; |
| 110584 | 352 |
| 353 CHECK_PROCESS (proc); | |
| 354 CHECK_SYMBOL (type); | |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
355 CHECK_LIST (proplist); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
356 |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
357 priority_string = Fplist_get (proplist, Qgnutls_bootprop_priority); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
358 trustfiles = Fplist_get (proplist, Qgnutls_bootprop_trustfiles); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
359 keyfiles = Fplist_get (proplist, Qgnutls_bootprop_keyfiles); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
360 callbacks = Fplist_get (proplist, Qgnutls_bootprop_callbacks); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
361 loglevel = Fplist_get (proplist, Qgnutls_bootprop_loglevel); |
| 110584 | 362 |
| 363 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
|
364 XPROCESS (proc)->gnutls_p = 1; |
| 110584 | 365 |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
366 if (NUMBERP (loglevel)) |
|
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
367 { |
|
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
368 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
|
369 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
|
370 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
|
371 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
|
372 } |
|
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
|
373 |
| 110584 | 374 /* always initialize globals. */ |
| 375 global_init = gnutls_emacs_global_init (); | |
| 376 if (! NILP (Fgnutls_errorp (global_init))) | |
| 377 return global_init; | |
| 378 | |
| 379 /* deinit and free resources. */ | |
| 380 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
|
381 { |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
382 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
|
383 |
| 110584 | 384 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
|
385 { |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
386 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
|
387 x509_cred = XPROCESS (proc)->gnutls_x509_cred; |
| 110584 | 388 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
|
389 } |
| 110584 | 390 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
|
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 (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
|
393 anon_cred = XPROCESS (proc)->gnutls_anon_cred; |
| 110584 | 394 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
|
395 } |
| 110584 | 396 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
|
397 { |
| 110584 | 398 error ("unknown credential type"); |
| 399 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
|
400 } |
| 110584 | 401 |
| 402 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
|
403 { |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
404 GNUTLS_LOG (1, max_log_level, "deallocating x509 credentials"); |
| 110584 | 405 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
|
406 } |
|
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 |
| 409 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_EMPTY; | |
| 410 | |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
411 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
|
412 |
| 110584 | 413 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
|
414 { |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
415 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
|
416 x509_cred = XPROCESS (proc)->gnutls_x509_cred; |
| 110584 | 417 if (gnutls_certificate_allocate_credentials (&x509_cred) < 0) |
| 418 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
|
419 } |
| 110584 | 420 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
|
421 { |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
422 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
|
423 anon_cred = XPROCESS (proc)->gnutls_anon_cred; |
| 110584 | 424 if (gnutls_anon_allocate_client_credentials (&anon_cred) < 0) |
| 425 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
|
426 } |
| 110584 | 427 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
|
428 { |
| 110584 | 429 error ("unknown credential type"); |
| 430 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
|
431 } |
| 110584 | 432 |
| 433 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
|
434 return gnutls_make_error (ret); |
| 110584 | 435 |
| 436 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_ALLOC; | |
| 437 | |
| 438 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
|
439 { |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
440 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
|
441 { |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
442 Lisp_Object trustfile = Fcar (tail); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
443 if (STRINGP (trustfile)) |
|
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 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
|
446 SDATA (trustfile)); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
447 ret = gnutls_certificate_set_x509_trust_file |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
448 (x509_cred, |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
449 SDATA (trustfile), |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
450 file_format); |
|
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112275
diff
changeset
|
451 |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
452 if (ret < GNUTLS_E_SUCCESS) |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
453 return gnutls_make_error (ret); |
|
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 else |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
456 { |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
457 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
|
458 trustfile); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
459 } |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
460 } |
| 110584 | 461 |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
462 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
|
463 { |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
464 Lisp_Object keyfile = Fcar (tail); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
465 if (STRINGP (keyfile)) |
|
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 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
|
468 SDATA (keyfile)); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
469 ret = gnutls_certificate_set_x509_crl_file |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
470 (x509_cred, |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
471 SDATA (keyfile), |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
472 file_format); |
|
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112275
diff
changeset
|
473 |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
474 if (ret < GNUTLS_E_SUCCESS) |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
475 return gnutls_make_error (ret); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
476 } |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
477 else |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
478 { |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
479 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
|
480 keyfile); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
481 } |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
482 } |
|
110652
056ce44cedcd
Clean up gnutls.c coding style to conform with the Emacs style.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110649
diff
changeset
|
483 } |
| 110584 | 484 |
| 485 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_FILES; | |
| 486 | |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
487 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
|
488 |
| 110584 | 489 ret = gnutls_init (&state, GNUTLS_CLIENT); |
| 490 | |
| 491 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
|
492 return gnutls_make_error (ret); |
| 110584 | 493 |
| 494 XPROCESS (proc)->gnutls_state = state; | |
| 495 | |
| 496 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT; | |
| 497 | |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
498 if (STRINGP (priority_string)) |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
499 { |
|
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112275
diff
changeset
|
500 priority_string_ptr = SSDATA (priority_string); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
501 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
|
502 priority_string_ptr); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
503 } |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
504 else |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
505 { |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
506 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
|
507 priority_string_ptr); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
508 } |
|
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112275
diff
changeset
|
509 |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
510 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
|
511 |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
512 ret = gnutls_priority_set_direct (state, |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
513 priority_string_ptr, |
|
110724
3ccf1931ae33
src/gnutls.c: Doc fixes. Make some functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110652
diff
changeset
|
514 NULL); |
| 110584 | 515 |
| 516 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
|
517 return gnutls_make_error (ret); |
| 110584 | 518 |
| 519 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_PRIORITY; | |
| 520 | |
| 521 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
|
522 { |
| 110584 | 523 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
|
524 } |
| 110584 | 525 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
|
526 { |
| 110584 | 527 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
|
528 } |
| 110584 | 529 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
|
530 { |
| 110584 | 531 error ("unknown credential type"); |
| 532 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
|
533 } |
| 110584 | 534 |
| 535 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
|
536 return gnutls_make_error (ret); |
| 110584 | 537 |
|
110611
6c735824d0c1
Add gnutls logging and clean up various gnutls bits.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110608
diff
changeset
|
538 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
|
539 XPROCESS (proc)->gnutls_x509_cred = x509_cred; |
| 110584 | 540 XPROCESS (proc)->gnutls_cred_type = type; |
| 541 | |
| 542 GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET; | |
| 543 | |
|
110649
2f0d755fa21b
Do the gnutls handshake from the reader loop, instead of looping over
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110648
diff
changeset
|
544 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
|
545 |
| 110584 | 546 return gnutls_make_error (GNUTLS_E_SUCCESS); |
| 547 } | |
| 548 | |
| 549 DEFUN ("gnutls-bye", Fgnutls_bye, | |
| 550 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
|
551 doc: /* Terminate current GnuTLS connection for process PROC. |
| 110584 | 552 The connection should have been initiated using `gnutls-handshake'. |
| 553 | |
| 554 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
|
555 receives and sends will be disallowed. If the return value is zero you |
| 110584 | 556 may continue using the connection. If CONT is nil, GnuTLS actually |
| 557 sends an alert containing a close request and waits for the peer to | |
| 558 reply with the same message. In order to reuse the connection you | |
| 559 should wait for an EOF from the peer. | |
| 560 | |
| 561 This function may also return `gnutls-e-again', or | |
| 562 `gnutls-e-interrupted'. */) | |
| 563 (Lisp_Object proc, Lisp_Object cont) | |
| 564 { | |
| 565 gnutls_session_t state; | |
| 566 int ret; | |
| 567 | |
| 568 CHECK_PROCESS (proc); | |
| 569 | |
| 570 state = XPROCESS (proc)->gnutls_state; | |
| 571 | |
| 572 ret = gnutls_bye (state, | |
| 573 NILP (cont) ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR); | |
| 574 | |
| 575 return gnutls_make_error (ret); | |
| 576 } | |
| 577 | |
| 578 void | |
| 579 syms_of_gnutls (void) | |
| 580 { | |
| 581 global_initialized = 0; | |
| 582 | |
| 583 Qgnutls_code = intern_c_string ("gnutls-code"); | |
| 584 staticpro (&Qgnutls_code); | |
| 585 | |
| 586 Qgnutls_anon = intern_c_string ("gnutls-anon"); | |
| 587 staticpro (&Qgnutls_anon); | |
| 588 | |
| 589 Qgnutls_x509pki = intern_c_string ("gnutls-x509pki"); | |
| 590 staticpro (&Qgnutls_x509pki); | |
| 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_priority = intern_c_string (":priority"); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
593 staticpro (&Qgnutls_bootprop_priority); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
594 |
|
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
595 Qgnutls_bootprop_trustfiles = intern_c_string (":trustfiles"); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
596 staticpro (&Qgnutls_bootprop_trustfiles); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
597 |
|
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
598 Qgnutls_bootprop_keyfiles = intern_c_string (":keyfiles"); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
599 staticpro (&Qgnutls_bootprop_keyfiles); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
600 |
|
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
601 Qgnutls_bootprop_callbacks = intern_c_string (":callbacks"); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
602 staticpro (&Qgnutls_bootprop_callbacks); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
603 |
|
110875
bb9bf961ba7b
Make emacs_gnutls_read() return the expected on errors.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110745
diff
changeset
|
604 Qgnutls_bootprop_loglevel = intern_c_string (":loglevel"); |
|
110745
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
605 staticpro (&Qgnutls_bootprop_loglevel); |
|
af2db97ca17a
Rework the gnutls boot interface.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110728
diff
changeset
|
606 |
| 110584 | 607 Qgnutls_e_interrupted = intern_c_string ("gnutls-e-interrupted"); |
| 608 staticpro (&Qgnutls_e_interrupted); | |
| 609 Fput (Qgnutls_e_interrupted, Qgnutls_code, | |
| 610 make_number (GNUTLS_E_INTERRUPTED)); | |
| 611 | |
| 612 Qgnutls_e_again = intern_c_string ("gnutls-e-again"); | |
| 613 staticpro (&Qgnutls_e_again); | |
| 614 Fput (Qgnutls_e_again, Qgnutls_code, | |
| 615 make_number (GNUTLS_E_AGAIN)); | |
| 616 | |
| 617 Qgnutls_e_invalid_session = intern_c_string ("gnutls-e-invalid-session"); | |
| 618 staticpro (&Qgnutls_e_invalid_session); | |
| 619 Fput (Qgnutls_e_invalid_session, Qgnutls_code, | |
| 620 make_number (GNUTLS_E_INVALID_SESSION)); | |
| 621 | |
| 622 Qgnutls_e_not_ready_for_handshake = | |
| 623 intern_c_string ("gnutls-e-not-ready-for-handshake"); | |
| 624 staticpro (&Qgnutls_e_not_ready_for_handshake); | |
| 625 Fput (Qgnutls_e_not_ready_for_handshake, Qgnutls_code, | |
| 626 make_number (GNUTLS_E_APPLICATION_ERROR_MIN)); | |
| 627 | |
| 628 defsubr (&Sgnutls_get_initstage); | |
| 629 defsubr (&Sgnutls_errorp); | |
| 630 defsubr (&Sgnutls_error_fatalp); | |
| 631 defsubr (&Sgnutls_error_string); | |
| 632 defsubr (&Sgnutls_boot); | |
| 633 defsubr (&Sgnutls_deinit); | |
| 634 defsubr (&Sgnutls_bye); | |
| 635 } | |
| 636 #endif |
