diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2011-04-24 20:30:51 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2011-04-24 20:30:51 -0500 |
| commit | e061a11b5a59f02fac66184e991f01a433f6dc8d (patch) | |
| tree | ccff6a6012dbc1ed4ce247b9e4e84a38c5eb34af /src/gnutls.h | |
| parent | 33630d51504adc5b2a0289f356c0a1a49f0bd10a (diff) | |
| download | emacs-e061a11b5a59f02fac66184e991f01a433f6dc8d.tar.gz emacs-e061a11b5a59f02fac66184e991f01a433f6dc8d.tar.bz2 emacs-e061a11b5a59f02fac66184e991f01a433f6dc8d.zip | |
Add GnuTLS support for W32 and certificate and hostname verification in GnuTLS.
* src/gnutls.c: Renamed global_initialized to
gnutls_global_initialized. Added internals for the
:verify-hostname-error, :verify-error, and :verify-flags
parameters of `gnutls-boot' and documented those parameters in the
docstring. Start callback support.
(emacs_gnutls_handshake): Add Woe32 support. Retry handshake
unless a fatal error occured. Call gnutls_alert_send_appropriate
on error. Return error code.
(emacs_gnutls_write): Call emacs_gnutls_handle_error.
(emacs_gnutls_read): Likewise.
(Fgnutls_boot): Return handshake error code.
(emacs_gnutls_handle_error): New function.
(wsaerror_to_errno): Likewise.
* src/gnutls.h: Add GNUTLS_STAGE_CALLBACKS enum to denote we're in the
callbacks stage.
* src/w32.c (emacs_gnutls_pull): New function for GnuTLS on Woe32.
(emacs_gnutls_push): Likewise.
* src/w32.h (emacs_gnutls_pull): Add prototype.
(emacs_gnutls_push): Likewise.
Diffstat (limited to 'src/gnutls.h')
| -rw-r--r-- | src/gnutls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gnutls.h b/src/gnutls.h index 5240d94c2ad..6c2e4c69523 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -21,6 +21,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_GNUTLS #include <gnutls/gnutls.h> +#include <gnutls/x509.h> typedef enum { @@ -28,6 +29,7 @@ typedef enum GNUTLS_STAGE_EMPTY = 0, GNUTLS_STAGE_CRED_ALLOC, GNUTLS_STAGE_FILES, + GNUTLS_STAGE_CALLBACKS, GNUTLS_STAGE_INIT, GNUTLS_STAGE_PRIORITY, GNUTLS_STAGE_CRED_SET, |