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.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 0dd06b7efc3..4ba314318db 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -105,6 +105,7 @@ OBJ2 =  $(BLD)/sysdep.$(O)		\
         $(BLD)/floatfns.$(O)            \
         $(BLD)/frame.$(O)               \
         $(BLD)/gmalloc.$(O)             \
+        $(BLD)/gnutls.$(O)              \
         $(BLD)/intervals.$(O)           \
         $(BLD)/composite.$(O)           \
         $(BLD)/ralloc.$(O)              \
@@ -150,6 +151,7 @@ LIBS =  $(TLIB0)	\
         $(OLE32)        \
         $(COMCTL32)     \
         $(UNISCRIBE)    \
+        $(USER_LIBS)    \
         $(libc)
 
 #
@@ -950,6 +952,14 @@ $(BLD)/gmalloc.$(O) : \
         $(EMACS_ROOT)/nt/inc/unistd.h \
         $(SRC)/getpagesize.h
 
+$(BLD)/gnutls.$(O) : \
+        $(SRC)/gnutls.h \
+        $(SRC)/gnutls.c \
+        $(CONFIG_H) \
+        $(EMACS_ROOT)/nt/inc/sys/socket.h \
+        $(SRC)/lisp.h \
+        $(SRC)/process.h
+
 $(BLD)/image.$(O) : \
         $(SRC)/image.c \
         $(CONFIG_H) \