Mercurial > mxe-octave
annotate src/msvc-gnutls-1.patch @ 3834:291c610413cd
use autotools for building gl2ps on Linux systems
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 04 Mar 2015 17:25:01 -0500 |
parents | 55c51f5ec98d |
children |
rev | line source |
---|---|
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1 diff -ur gnutls-3.2.3-orig/extra/Makefile.am gnutls-3.2.3/extra/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
2 --- gnutls-3.2.3-orig/extra/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
3 +++ gnutls-3.2.3/extra/Makefile.am 2013-11-06 09:39:56 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -45,7 +45,9 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 # OpenSSL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 -libgnutls_openssl_la_LDFLAGS = -no-undefined |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 +libgnutls_openssl_la_LDFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 + -no-undefined \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 + -export-symbols-regex '^(SSL|SSLv3|SSLv23|TLSv1|OpenSSL|X509|BIO|ERR|RAND|MD5|RIPEMD160)_.*' |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 if ENABLE_OPENSSL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 lib_LTLIBRARIES = libgnutls-openssl.la |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 @@ -70,7 +72,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 libgnutls_openssl_la_LDFLAGS += \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 -Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 libgnutls-openssl-$(DLL_VERSION).def: libgnutls-openssl.la |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 -defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 +#defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
24 diff -ur gnutls-3.2.3-orig/lib/Makefile.am gnutls-3.2.3/lib/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
25 --- gnutls-3.2.3-orig/lib/Makefile.am 2013-07-29 03:53:00 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
26 +++ gnutls-3.2.3/lib/Makefile.am 2013-11-06 14:10:20 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
27 @@ -37,7 +37,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
28 -I$(srcdir)/includes \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
29 -I$(builddir)/includes \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
30 -I$(srcdir)/x509 \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
31 - $(LIBTASN1_CFLAGS) \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
32 + $(LIBTASN1_CFLAGS) -DASN1_STATIC \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
33 $(P11_KIT_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
35 if ENABLE_OPENPGP |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
36 @@ -108,6 +108,8 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
37 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
38 # Separate so we can create the documentation |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
39 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
40 +libgnutls_la_CPPFLAGS = $(AM_CPPFLAGS) -DGNUTLS_BUILDING |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
41 + |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
42 libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS) \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
43 $(PSK_COBJECTS) \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
44 gnutls.asn pkix.asn libgnutls.map |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
45 @@ -149,7 +151,7 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 libgnutls-$(DLL_VERSION).def: libgnutls.la |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 defexecdir = $(bindir) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 -defexec_DATA = libgnutls-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 +#defexec_DATA = libgnutls-$(DLL_VERSION).def |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 DISTCLEANFILES += $(defexec_DATA) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
54 @@ -162,7 +164,7 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 # C++ library |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 if ENABLE_CXX |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 -libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes -I$(srcdir)/includes |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 +libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes -I$(srcdir)/includes -DGNUTLSXX_BUILDING |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 AM_CXXFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 -I$(srcdir)/includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
63 @@ -198,7 +200,8 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
64 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
65 if HAVE_LD_OUTPUT_DEF |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
66 libgnutls_xssl_la_LDFLAGS += \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
67 - -Wl,--output-def,libgnutls-xssl-$(DLL_VERSION).def |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
68 + -Wl,--output-def,libgnutls-xssl-$(DLL_VERSION).def \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
69 + -export-symbols-regex '^(xssl_).*' |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
70 libgnutls-xssl-$(DLL_VERSION).def: libgnutls-xssl.la |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
71 -defexec_DATA += libgnutls-xssl-$(DLL_VERSION).def |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
72 +#defexec_DATA += libgnutls-xssl-$(DLL_VERSION).def |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
73 endif |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
74 diff -ur gnutls-3.2.3-orig/lib/accelerated/Makefile.am gnutls-3.2.3/lib/accelerated/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
75 --- gnutls-3.2.3-orig/lib/accelerated/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
76 +++ gnutls-3.2.3/lib/accelerated/Makefile.am 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
77 @@ -21,6 +21,7 @@ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
78 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
79 SUBDIRS = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
84 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
85 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/Makefile.am gnutls-3.2.3/lib/accelerated/x86/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
86 --- gnutls-3.2.3-orig/lib/accelerated/x86/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
87 +++ gnutls-3.2.3/lib/accelerated/x86/Makefile.am 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
88 @@ -21,6 +21,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
89 AM_LIBTOOLFLAGS=--tag=CC |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
90 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
91 AM_CPPFLAGS = -I$(srcdir)/../../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
92 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
93 -I$(builddir)/../../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
94 -I$(srcdir)/../../includes \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
95 -I$(builddir)/../../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
96 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/aes-gcm-padlock.c gnutls-3.2.3/lib/accelerated/x86/aes-gcm-padlock.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
97 --- gnutls-3.2.3-orig/lib/accelerated/x86/aes-gcm-padlock.c 2013-02-10 05:29:54 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
98 +++ gnutls-3.2.3/lib/accelerated/x86/aes-gcm-padlock.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
99 @@ -153,14 +153,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
100 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
101 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
102 const gnutls_crypto_cipher_st aes_gcm_padlock_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
103 - .init = aes_gcm_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
104 - .setkey = aes_gcm_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
105 - .setiv = aes_gcm_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
106 - .encrypt = aes_gcm_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 - .decrypt = aes_gcm_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 - .deinit = aes_gcm_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 - .tag = aes_gcm_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 - .auth = aes_gcm_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
111 + aes_gcm_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
112 + aes_gcm_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
113 + aes_gcm_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
114 + aes_gcm_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
115 + aes_gcm_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
116 + aes_gcm_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 + aes_gcm_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
118 + aes_gcm_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
119 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
120 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
121 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
122 #endif |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
123 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/aes-gcm-x86.c gnutls-3.2.3/lib/accelerated/x86/aes-gcm-x86.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
124 --- gnutls-3.2.3-orig/lib/accelerated/x86/aes-gcm-x86.c 2013-02-10 05:29:54 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
125 +++ gnutls-3.2.3/lib/accelerated/x86/aes-gcm-x86.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
126 @@ -259,12 +259,13 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 const gnutls_crypto_cipher_st aes_gcm_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 - .init = aes_gcm_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 - .setkey = aes_gcm_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
132 - .setiv = aes_gcm_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
133 - .encrypt = aes_gcm_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
134 - .decrypt = aes_gcm_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
135 - .deinit = aes_gcm_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
136 - .tag = aes_gcm_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
137 - .auth = aes_gcm_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
138 + aes_gcm_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
139 + aes_gcm_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
140 + aes_gcm_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
141 + aes_gcm_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
142 + aes_gcm_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
143 + aes_gcm_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
144 + aes_gcm_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
145 + aes_gcm_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
146 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
147 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
148 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/aes-padlock.c gnutls-3.2.3/lib/accelerated/x86/aes-padlock.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
149 --- gnutls-3.2.3-orig/lib/accelerated/x86/aes-padlock.c 2013-02-10 05:29:54 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
150 +++ gnutls-3.2.3/lib/accelerated/x86/aes-padlock.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
151 @@ -159,12 +159,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
152 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
153 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
154 static const gnutls_crypto_cipher_st aes_padlock_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
155 - .init = aes_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
156 - .setkey = padlock_aes_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
157 - .setiv = aes_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
158 - .encrypt = padlock_aes_cbc_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
159 - .decrypt = padlock_aes_cbc_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
160 - .deinit = aes_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
161 + aes_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
162 + padlock_aes_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
163 + aes_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
164 + padlock_aes_cbc_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
165 + padlock_aes_cbc_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
166 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
167 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
168 + aes_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
169 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
170 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
171 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
172 static int |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
173 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/aes-x86.c gnutls-3.2.3/lib/accelerated/x86/aes-x86.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
174 --- gnutls-3.2.3-orig/lib/accelerated/x86/aes-x86.c 2013-02-10 05:29:54 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
175 +++ gnutls-3.2.3/lib/accelerated/x86/aes-x86.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
176 @@ -114,12 +114,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
177 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
178 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
179 static const gnutls_crypto_cipher_st cipher_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
180 - .init = aes_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
181 - .setkey = aes_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
182 - .setiv = aes_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
183 - .encrypt = aes_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
184 - .decrypt = aes_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
185 - .deinit = aes_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
186 + aes_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
187 + aes_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
188 + aes_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
189 + aes_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
190 + aes_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
191 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
192 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
193 + aes_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
194 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
195 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
196 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
197 static unsigned |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
198 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/hmac-padlock.c gnutls-3.2.3/lib/accelerated/x86/hmac-padlock.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
199 --- gnutls-3.2.3-orig/lib/accelerated/x86/hmac-padlock.c 2013-05-25 04:52:07 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
200 +++ gnutls-3.2.3/lib/accelerated/x86/hmac-padlock.c 2013-11-06 10:05:17 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
201 @@ -333,23 +333,23 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
202 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
203 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
204 const gnutls_crypto_mac_st hmac_sha_padlock_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
205 - .init = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
206 - .setkey = NULL, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
207 - .setnonce = NULL, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
208 - .hash = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
209 - .output = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
210 - .deinit = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
211 - .fast = wrap_padlock_hmac_fast |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
212 + /*.init =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
213 + /*.setkey =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
214 + /*.setnonce =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
215 + /*.hash =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
216 + /*.output =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
217 + /*.deinit =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
218 + /*.fast =*/ wrap_padlock_hmac_fast |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
219 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
220 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
221 const gnutls_crypto_mac_st hmac_sha_padlock_nano_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
222 - .init = wrap_padlock_hmac_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
223 - .setkey = wrap_padlock_hmac_setkey, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
224 - .setnonce = NULL, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
225 - .hash = wrap_padlock_hmac_update, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
226 - .output = wrap_padlock_hmac_output, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
227 - .deinit = wrap_padlock_hmac_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
228 - .fast = wrap_padlock_hmac_fast, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
229 + /*.init =*/ wrap_padlock_hmac_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
230 + /*.setkey =*/ wrap_padlock_hmac_setkey, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
231 + /*.setnonce =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
232 + /*.hash =*/ wrap_padlock_hmac_update, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
233 + /*.output =*/ wrap_padlock_hmac_output, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
234 + /*.deinit =*/ wrap_padlock_hmac_deinit, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
235 + /*.fast =*/ wrap_padlock_hmac_fast, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
236 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
237 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
238 #endif /* HAVE_LIBNETTLE */ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
239 diff -ur gnutls-3.2.3-orig/lib/accelerated/x86/sha-padlock.c gnutls-3.2.3/lib/accelerated/x86/sha-padlock.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
240 --- gnutls-3.2.3-orig/lib/accelerated/x86/sha-padlock.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
241 +++ gnutls-3.2.3/lib/accelerated/x86/sha-padlock.c 2013-11-06 10:03:49 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
242 @@ -374,19 +374,19 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
243 const struct nettle_hash padlock_sha512 = _NETTLE_HASH(sha512, SHA512); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
244 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
245 const gnutls_crypto_digest_st sha_padlock_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
246 - .init = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
247 - .hash = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
248 - .output = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
249 - .deinit = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
250 - .fast = wrap_padlock_hash_fast |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
251 + /*.init =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
252 + /*.hash =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
253 + /*.output =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
254 + /*.deinit =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
255 + /*.fast =*/ wrap_padlock_hash_fast |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
256 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
257 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
258 const gnutls_crypto_digest_st sha_padlock_nano_struct = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
259 - .init = wrap_padlock_hash_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
260 - .hash = wrap_padlock_hash_update, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
261 - .output = wrap_padlock_hash_output, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
262 - .deinit = wrap_padlock_hash_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
263 - .fast = wrap_padlock_hash_fast, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
264 + /*.init =*/ wrap_padlock_hash_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
265 + /*.hash =*/ wrap_padlock_hash_update, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
266 + /*.output =*/ wrap_padlock_hash_output, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
267 + /*.deinit =*/ wrap_padlock_hash_deinit, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
268 + /*.fast =*/ wrap_padlock_hash_fast, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
269 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
270 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
271 #endif /* HAVE_LIBNETTLE */ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
272 diff -ur gnutls-3.2.3-orig/lib/algorithms/Makefile.am gnutls-3.2.3/lib/algorithms/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
273 --- gnutls-3.2.3-orig/lib/algorithms/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
274 +++ gnutls-3.2.3/lib/algorithms/Makefile.am 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
275 @@ -20,6 +20,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
276 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
277 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
278 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
279 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
280 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
281 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
282 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
283 diff -ur gnutls-3.2.3-orig/lib/algorithms/ecc.c gnutls-3.2.3/lib/algorithms/ecc.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
284 --- gnutls-3.2.3-orig/lib/algorithms/ecc.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
285 +++ gnutls-3.2.3/lib/algorithms/ecc.c 2013-11-06 10:01:19 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
286 @@ -31,39 +31,39 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
287 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
288 static const gnutls_ecc_curve_entry_st ecc_curves[] = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
289 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
290 - .name = "SECP192R1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
291 - .oid = "1.2.840.10045.3.1.1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
292 - .id = GNUTLS_ECC_CURVE_SECP192R1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
293 - .tls_id = 19, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
294 - .size = 24, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
295 + /*.name =*/ "SECP192R1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
296 + /*.oid =*/ "1.2.840.10045.3.1.1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
297 + /*.id =*/ GNUTLS_ECC_CURVE_SECP192R1, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
298 + /*.tls_id =*/ 19, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
299 + /*.size =*/ 24, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
300 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
301 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
302 - .name = "SECP224R1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
303 - .oid = "1.3.132.0.33", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
304 - .id = GNUTLS_ECC_CURVE_SECP224R1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
305 - .tls_id = 21, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
306 - .size = 28, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
307 + /*.name =*/ "SECP224R1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
308 + /*.oid =*/ "1.3.132.0.33", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
309 + /*.id =*/ GNUTLS_ECC_CURVE_SECP224R1, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
310 + /*.tls_id =*/ 21, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
311 + /*.size =*/ 28, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
312 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
313 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
314 - .name = "SECP256R1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
315 - .oid = "1.2.840.10045.3.1.7", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
316 - .id = GNUTLS_ECC_CURVE_SECP256R1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
317 - .tls_id = 23, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
318 - .size = 32, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
319 + /*.name =*/ "SECP256R1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
320 + /*.oid =*/ "1.2.840.10045.3.1.7", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
321 + /*.id =*/ GNUTLS_ECC_CURVE_SECP256R1, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
322 + /*.tls_id =*/ 23, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
323 + /*.size =*/ 32, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
324 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
325 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
326 - .name = "SECP384R1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
327 - .oid = "1.3.132.0.34", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
328 - .id = GNUTLS_ECC_CURVE_SECP384R1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
329 - .tls_id = 24, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
330 - .size = 48, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
331 + /*.name =*/ "SECP384R1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
332 + /*.oid =*/ "1.3.132.0.34", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
333 + /*.id =*/ GNUTLS_ECC_CURVE_SECP384R1, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
334 + /*.tls_id =*/ 24, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
335 + /*.size =*/ 48, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
336 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
337 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
338 - .name = "SECP521R1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
339 - .oid = "1.3.132.0.35", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
340 - .id = GNUTLS_ECC_CURVE_SECP521R1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
341 - .tls_id = 25, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
342 - .size = 66, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
343 + /*.name =*/ "SECP521R1", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
344 + /*.oid =*/ "1.3.132.0.35", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
345 + /*.id =*/ GNUTLS_ECC_CURVE_SECP521R1, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
346 + /*.tls_id =*/ 25, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
347 + /*.size =*/ 66, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
348 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
349 {0, 0, 0} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
350 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
351 diff -ur gnutls-3.2.3-orig/lib/auth/Makefile.am gnutls-3.2.3/lib/auth/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
352 --- gnutls-3.2.3-orig/lib/auth/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
353 +++ gnutls-3.2.3/lib/auth/Makefile.am 2013-11-06 14:26:44 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
354 @@ -20,6 +20,8 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
355 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
356 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
357 AM_CPPFLAGS = \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
358 + -DGNUTLS_BUILDING \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
359 + -DASN1_STATIC \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
360 -I$(srcdir)/../../gl \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
361 -I$(builddir)/../../gl \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
362 -I$(srcdir)/../includes \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
363 diff -ur gnutls-3.2.3-orig/lib/ext/Makefile.am gnutls-3.2.3/lib/ext/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
364 --- gnutls-3.2.3-orig/lib/ext/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
365 +++ gnutls-3.2.3/lib/ext/Makefile.am 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
366 @@ -20,6 +20,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
367 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
368 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
369 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
370 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
371 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
372 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
373 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
374 diff -ur gnutls-3.2.3-orig/lib/ext/alpn.c gnutls-3.2.3/lib/ext/alpn.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
375 --- gnutls-3.2.3-orig/lib/ext/alpn.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
376 +++ gnutls-3.2.3/lib/ext/alpn.c 2013-11-06 12:50:34 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
377 @@ -38,15 +38,15 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
378 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
379 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
380 extension_entry_st ext_mod_alpn = { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
381 - .name = "ALPN", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
382 - .type = GNUTLS_EXTENSION_ALPN, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
383 - .parse_type = GNUTLS_EXT_APPLICATION, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
384 + /*.name =*/ "ALPN", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
385 + /*.type =*/ GNUTLS_EXTENSION_ALPN, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
386 + /*.parse_type =*/ GNUTLS_EXT_APPLICATION, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
387 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
388 - .recv_func = _gnutls_alpn_recv_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
389 - .send_func = _gnutls_alpn_send_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
390 - .pack_func = _gnutls_alpn_pack, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
391 - .unpack_func = _gnutls_alpn_unpack, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
392 - .deinit_func = _gnutls_alpn_deinit_data, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
393 + /*.recv_func =*/ _gnutls_alpn_recv_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
394 + /*.send_func =*/ _gnutls_alpn_send_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
395 + /*.deinit_func =*/ _gnutls_alpn_deinit_data, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
396 + /*.pack_func =*/ _gnutls_alpn_pack, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
397 + /*.unpack_func =*/ _gnutls_alpn_unpack, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
398 }; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
399 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
400 static int |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
401 diff -ur gnutls-3.2.3-orig/lib/ext/cert_type.c gnutls-3.2.3/lib/ext/cert_type.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
402 --- gnutls-3.2.3-orig/lib/ext/cert_type.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
403 +++ gnutls-3.2.3/lib/ext/cert_type.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
404 @@ -43,15 +43,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
405 gnutls_buffer_st * extdata); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
406 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
407 extension_entry_st ext_mod_cert_type = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
408 - .name = "CERT TYPE", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
409 - .type = GNUTLS_EXTENSION_CERT_TYPE, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
410 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
411 + "CERT TYPE", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
412 + GNUTLS_EXTENSION_CERT_TYPE, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
413 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
414 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
415 - .recv_func = _gnutls_cert_type_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
416 - .send_func = _gnutls_cert_type_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
417 - .pack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
418 - .unpack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
419 - .deinit_func = NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
420 + _gnutls_cert_type_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
421 + _gnutls_cert_type_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
422 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
423 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
424 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
425 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
426 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
427 /* |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
428 diff -ur gnutls-3.2.3-orig/lib/ext/ecc.c gnutls-3.2.3/lib/ext/ecc.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
429 --- gnutls-3.2.3-orig/lib/ext/ecc.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
430 +++ gnutls-3.2.3/lib/ext/ecc.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
431 @@ -49,27 +49,27 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
432 gnutls_buffer_st * extdata); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
433 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
434 extension_entry_st ext_mod_supported_ecc = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
435 - .name = "SUPPORTED ECC", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
436 - .type = GNUTLS_EXTENSION_SUPPORTED_ECC, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
437 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
438 + "SUPPORTED ECC", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
439 + GNUTLS_EXTENSION_SUPPORTED_ECC, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
440 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
441 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
442 - .recv_func = _gnutls_supported_ecc_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
443 - .send_func = _gnutls_supported_ecc_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
444 - .pack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
445 - .unpack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
446 - .deinit_func = NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
447 + _gnutls_supported_ecc_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
448 + _gnutls_supported_ecc_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
449 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
450 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
451 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
452 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
453 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
454 extension_entry_st ext_mod_supported_ecc_pf = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
455 - .name = "SUPPORTED ECC POINT FORMATS", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
456 - .type = GNUTLS_EXTENSION_SUPPORTED_ECC_PF, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
457 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
458 + "SUPPORTED ECC POINT FORMATS", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
459 + GNUTLS_EXTENSION_SUPPORTED_ECC_PF, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
460 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
461 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
462 - .recv_func = _gnutls_supported_ecc_pf_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
463 - .send_func = _gnutls_supported_ecc_pf_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
464 - .pack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
465 - .unpack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
466 - .deinit_func = NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
467 + _gnutls_supported_ecc_pf_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
468 + _gnutls_supported_ecc_pf_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
469 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
470 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
471 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
472 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
473 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
474 /* |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
475 diff -ur gnutls-3.2.3-orig/lib/ext/heartbeat.c gnutls-3.2.3/lib/ext/heartbeat.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
476 --- gnutls-3.2.3-orig/lib/ext/heartbeat.c 2013-06-08 02:50:45 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
477 +++ gnutls-3.2.3/lib/ext/heartbeat.c 2013-11-06 09:39:57 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
478 @@ -484,15 +484,15 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
479 } |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
480 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
481 extension_entry_st ext_mod_heartbeat = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
482 - .name = "HEARTBEAT", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
483 - .type = GNUTLS_EXTENSION_HEARTBEAT, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
484 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
485 + "HEARTBEAT", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
486 + GNUTLS_EXTENSION_HEARTBEAT, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
487 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
488 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
489 - .recv_func = _gnutls_heartbeat_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
490 - .send_func = _gnutls_heartbeat_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
491 - .pack_func = _gnutls_heartbeat_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
492 - .unpack_func = _gnutls_heartbeat_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
493 - .deinit_func = NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
494 + _gnutls_heartbeat_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
495 + _gnutls_heartbeat_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
496 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
497 + _gnutls_heartbeat_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
498 + _gnutls_heartbeat_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
499 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
501 #else |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
502 diff -ur gnutls-3.2.3-orig/lib/ext/max_record.c gnutls-3.2.3/lib/ext/max_record.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
503 --- gnutls-3.2.3-orig/lib/ext/max_record.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
504 +++ gnutls-3.2.3/lib/ext/max_record.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
505 @@ -48,15 +48,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
506 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
507 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
508 extension_entry_st ext_mod_max_record_size = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
509 - .name = "MAX RECORD SIZE", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
510 - .type = GNUTLS_EXTENSION_MAX_RECORD_SIZE, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
511 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
512 + "MAX RECORD SIZE", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
513 + GNUTLS_EXTENSION_MAX_RECORD_SIZE, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
514 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
515 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
516 - .recv_func = _gnutls_max_record_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
517 - .send_func = _gnutls_max_record_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
518 - .pack_func = _gnutls_max_record_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
519 - .unpack_func = _gnutls_max_record_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
520 - .deinit_func = NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
521 + _gnutls_max_record_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
522 + _gnutls_max_record_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
523 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
524 + _gnutls_max_record_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
525 + _gnutls_max_record_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
526 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
527 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
528 /* |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
529 diff -ur gnutls-3.2.3-orig/lib/ext/new_record_padding.c gnutls-3.2.3/lib/ext/new_record_padding.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
530 --- gnutls-3.2.3-orig/lib/ext/new_record_padding.c 2013-07-28 03:31:47 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
531 +++ gnutls-3.2.3/lib/ext/new_record_padding.c 2013-11-06 12:54:19 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
532 @@ -37,16 +37,16 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
533 static int new_record_padding_before_epoch_change(gnutls_session_t session); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
534 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
535 extension_entry_st ext_mod_new_record_padding = { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
536 - .name = "NEW_RECORD_PADDING", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
537 - .type = GNUTLS_EXTENSION_NEW_RECORD_PADDING, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
538 - .parse_type = GNUTLS_EXT_TLS, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
539 + /*.name =*/ "NEW_RECORD_PADDING", |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
540 + /*.type =*/ GNUTLS_EXTENSION_NEW_RECORD_PADDING, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
541 + /*.parse_type =*/ GNUTLS_EXT_TLS, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
542 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
543 - .recv_func = new_record_padding_recv_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
544 - .send_func = new_record_padding_send_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
545 - .pack_func = NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
546 - .unpack_func = NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
547 - .deinit_func = NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
548 - .epoch_func = new_record_padding_before_epoch_change |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
549 + /*.recv_func =*/ new_record_padding_recv_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
550 + /*.send_func =*/ new_record_padding_send_params, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
551 + /*.deinit_func =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
552 + /*.pack_func =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
553 + /*.unpack_func =*/ NULL, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
554 + /*.epoch_func =*/ new_record_padding_before_epoch_change |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
555 }; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
556 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
557 static int |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
558 diff -ur gnutls-3.2.3-orig/lib/ext/safe_renegotiation.c gnutls-3.2.3/lib/ext/safe_renegotiation.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
559 --- gnutls-3.2.3-orig/lib/ext/safe_renegotiation.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
560 +++ gnutls-3.2.3/lib/ext/safe_renegotiation.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
561 @@ -31,15 +31,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
562 static void _gnutls_sr_deinit_data (extension_priv_data_t priv); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
563 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
564 extension_entry_st ext_mod_sr = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
565 - .name = "SAFE RENEGOTIATION", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
566 - .type = GNUTLS_EXTENSION_SAFE_RENEGOTIATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
567 - .parse_type = GNUTLS_EXT_MANDATORY, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
568 + "SAFE RENEGOTIATION", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
569 + GNUTLS_EXTENSION_SAFE_RENEGOTIATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
570 + GNUTLS_EXT_MANDATORY, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
571 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
572 - .recv_func = _gnutls_sr_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
573 - .send_func = _gnutls_sr_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
574 - .pack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
575 - .unpack_func = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
576 - .deinit_func = _gnutls_sr_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
577 + _gnutls_sr_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
578 + _gnutls_sr_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
579 + _gnutls_sr_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
580 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
581 + NULL |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
582 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
583 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
584 int |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
585 diff -ur gnutls-3.2.3-orig/lib/ext/server_name.c gnutls-3.2.3/lib/ext/server_name.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
586 --- gnutls-3.2.3-orig/lib/ext/server_name.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
587 +++ gnutls-3.2.3/lib/ext/server_name.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
588 @@ -40,15 +40,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
589 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
590 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
591 extension_entry_st ext_mod_server_name = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
592 - .name = "SERVER NAME", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
593 - .type = GNUTLS_EXTENSION_SERVER_NAME, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
594 - .parse_type = GNUTLS_EXT_APPLICATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
595 + "SERVER NAME", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
596 + GNUTLS_EXTENSION_SERVER_NAME, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
597 + GNUTLS_EXT_APPLICATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
598 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
599 - .recv_func = _gnutls_server_name_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
600 - .send_func = _gnutls_server_name_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
601 - .pack_func = _gnutls_server_name_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
602 - .unpack_func = _gnutls_server_name_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
603 - .deinit_func = _gnutls_server_name_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
604 + _gnutls_server_name_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
605 + _gnutls_server_name_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
606 + _gnutls_server_name_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
607 + _gnutls_server_name_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
608 + _gnutls_server_name_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
609 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
610 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
611 /* |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
612 diff -ur gnutls-3.2.3-orig/lib/ext/session_ticket.c gnutls-3.2.3/lib/ext/session_ticket.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
613 --- gnutls-3.2.3-orig/lib/ext/session_ticket.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
614 +++ gnutls-3.2.3/lib/ext/session_ticket.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
615 @@ -52,15 +52,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
616 static void session_ticket_deinit_data (extension_priv_data_t priv); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
617 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
618 extension_entry_st ext_mod_session_ticket = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
619 - .name = "SESSION TICKET", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
620 - .type = GNUTLS_EXTENSION_SESSION_TICKET, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
621 - .parse_type = GNUTLS_EXT_MANDATORY, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
622 + "SESSION TICKET", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
623 + GNUTLS_EXTENSION_SESSION_TICKET, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
624 + GNUTLS_EXT_MANDATORY, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
625 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
626 - .recv_func = session_ticket_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
627 - .send_func = session_ticket_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
628 - .pack_func = session_ticket_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
629 - .unpack_func = session_ticket_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
630 - .deinit_func = session_ticket_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
631 + session_ticket_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
632 + session_ticket_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
633 + session_ticket_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
634 + session_ticket_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
635 + session_ticket_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
636 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
637 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
638 #define SESSION_KEY_SIZE (SESSION_TICKET_KEY_NAME_SIZE+SESSION_TICKET_KEY_SIZE+SESSION_TICKET_MAC_SECRET_SIZE) |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
639 diff -ur gnutls-3.2.3-orig/lib/ext/signature.c gnutls-3.2.3/lib/ext/signature.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
640 --- gnutls-3.2.3-orig/lib/ext/signature.c 2013-06-10 03:19:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
641 +++ gnutls-3.2.3/lib/ext/signature.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
642 @@ -46,15 +46,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
643 extension_priv_data_t * _priv); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
644 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
645 extension_entry_st ext_mod_sig = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
646 - .name = "SIGNATURE ALGORITHMS", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
647 - .type = GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
648 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
649 + "SIGNATURE ALGORITHMS", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
650 + GNUTLS_EXTENSION_SIGNATURE_ALGORITHMS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
651 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
652 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
653 - .recv_func = _gnutls_signature_algorithm_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
654 - .send_func = _gnutls_signature_algorithm_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
655 - .pack_func = signature_algorithms_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
656 - .unpack_func = signature_algorithms_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
657 - .deinit_func = signature_algorithms_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
658 + _gnutls_signature_algorithm_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
659 + _gnutls_signature_algorithm_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
660 + signature_algorithms_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
661 + signature_algorithms_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
662 + signature_algorithms_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
663 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
664 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
665 typedef struct |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
666 diff -ur gnutls-3.2.3-orig/lib/ext/srp.c gnutls-3.2.3/lib/ext/srp.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
667 --- gnutls-3.2.3-orig/lib/ext/srp.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
668 +++ gnutls-3.2.3/lib/ext/srp.c 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
669 @@ -42,15 +42,15 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
670 static int _gnutls_srp_send_params (gnutls_session_t state, gnutls_buffer_st * extdata); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
671 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
672 extension_entry_st ext_mod_srp = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
673 - .name = "SRP", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
674 - .type = GNUTLS_EXTENSION_SRP, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
675 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
676 + "SRP", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
677 + GNUTLS_EXTENSION_SRP, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
678 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
679 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
680 - .recv_func = _gnutls_srp_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
681 - .send_func = _gnutls_srp_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
682 - .pack_func = _gnutls_srp_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
683 - .unpack_func = _gnutls_srp_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
684 - .deinit_func = _gnutls_srp_deinit_data |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
685 + _gnutls_srp_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
686 + _gnutls_srp_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
687 + _gnutls_srp_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
688 + _gnutls_srp_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
689 + _gnutls_srp_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
690 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
691 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
692 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
693 diff -ur gnutls-3.2.3-orig/lib/ext/srtp.c gnutls-3.2.3/lib/ext/srtp.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
694 --- gnutls-3.2.3-orig/lib/ext/srtp.c 2013-07-13 05:42:56 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
695 +++ gnutls-3.2.3/lib/ext/srtp.c 2013-11-06 09:39:57 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
696 @@ -40,15 +40,15 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
697 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
698 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
699 extension_entry_st ext_mod_srtp = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
700 - .name = "SRTP", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
701 - .type = GNUTLS_EXTENSION_SRTP, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
702 - .parse_type = GNUTLS_EXT_APPLICATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
703 + "SRTP", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
704 + GNUTLS_EXTENSION_SRTP, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
705 + GNUTLS_EXT_APPLICATION, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
706 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
707 - .recv_func = _gnutls_srtp_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
708 - .send_func = _gnutls_srtp_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
709 - .pack_func = _gnutls_srtp_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
710 - .unpack_func = _gnutls_srtp_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
711 - .deinit_func = _gnutls_srtp_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
712 + _gnutls_srtp_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
713 + _gnutls_srtp_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
714 + _gnutls_srtp_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
715 + _gnutls_srtp_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
716 + _gnutls_srtp_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
717 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
718 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
719 typedef struct |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
720 diff -ur gnutls-3.2.3-orig/lib/ext/status_request.c gnutls-3.2.3/lib/ext/status_request.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
721 --- gnutls-3.2.3-orig/lib/ext/status_request.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
722 +++ gnutls-3.2.3/lib/ext/status_request.c 2013-11-06 09:39:57 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
723 @@ -508,14 +508,14 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
724 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
725 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
726 extension_entry_st ext_mod_status_request = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
727 - .name = "STATUS REQUEST", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
728 - .type = GNUTLS_EXTENSION_STATUS_REQUEST, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
729 - .parse_type = GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
730 - .recv_func = _gnutls_status_request_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
731 - .send_func = _gnutls_status_request_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
732 - .pack_func = _gnutls_status_request_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
733 - .unpack_func = _gnutls_status_request_unpack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
734 - .deinit_func = _gnutls_status_request_deinit_data |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
735 + "STATUS REQUEST", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
736 + GNUTLS_EXTENSION_STATUS_REQUEST, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
737 + GNUTLS_EXT_TLS, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
738 + _gnutls_status_request_recv_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
739 + _gnutls_status_request_send_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
740 + _gnutls_status_request_deinit_data, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
741 + _gnutls_status_request_pack, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
742 + _gnutls_status_request_unpack |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
743 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
744 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
745 /* Functions to be called from handshake */ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
746 diff -ur gnutls-3.2.3-orig/lib/extras/Makefile.am gnutls-3.2.3/lib/extras/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
747 --- gnutls-3.2.3-orig/lib/extras/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
748 +++ gnutls-3.2.3/lib/extras/Makefile.am 2013-11-06 09:39:57 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
749 @@ -20,6 +20,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
750 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
751 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
752 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
753 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
754 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
755 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
756 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
757 diff -ur gnutls-3.2.3-orig/lib/gnutls_cipher.c gnutls-3.2.3/lib/gnutls_cipher.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
758 --- gnutls-3.2.3-orig/lib/gnutls_cipher.c 2013-07-28 03:51:38 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
759 +++ gnutls-3.2.3/lib/gnutls_cipher.c 2013-11-06 13:18:32 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
760 @@ -659,7 +659,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
761 */ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
762 if (explicit_iv && _gnutls_auth_cipher_is_aead(¶ms->read.cipher_state)) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
763 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
764 - uint8_t nonce[blocksize]; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
765 + uint8_t *nonce = _alloca(blocksize * sizeof(uint8_t)); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
766 /* Values in AEAD are pretty fixed in TLS 1.2 for 128-bit block |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
767 */ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
768 if (unlikely(params->read.IV.data == NULL || params->read.IV.size != 4)) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
769 @@ -855,7 +855,7 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
770 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
771 if (explicit_iv && _gnutls_auth_cipher_is_aead(¶ms->read.cipher_state)) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
772 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
773 - uint8_t nonce[blocksize]; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
774 + uint8_t * nonce; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
775 /* Values in AEAD are pretty fixed in TLS 1.2 for 128-bit block |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
776 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
777 if (params->read.IV.data == NULL || params->read.IV.size != 4) |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
778 @@ -864,6 +864,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
779 if (ciphertext->size < tag_size+AEAD_EXPLICIT_DATA_SIZE + 2) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
780 return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET_LENGTH); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
781 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
782 + nonce = (uint8_t *) malloc (sizeof (uint8_t) * blocksize); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
783 memcpy(nonce, params->read.IV.data, AEAD_IMPLICIT_DATA_SIZE); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
784 memcpy(&nonce[AEAD_IMPLICIT_DATA_SIZE], ciphertext->data, AEAD_EXPLICIT_DATA_SIZE); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
785 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
786 @@ -873,6 +874,7 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
787 ciphertext->size -= AEAD_EXPLICIT_DATA_SIZE; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
788 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
789 length_to_decrypt = ciphertext->size - tag_size; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
790 + free (nonce); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
791 } |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
792 else if (iv_size > 0) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
793 { /* a stream cipher with explicit IV */ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
794 diff -ur gnutls-3.2.3-orig/lib/gnutls_global.h gnutls-3.2.3/lib/gnutls_global.h |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
795 --- gnutls-3.2.3-orig/lib/gnutls_global.h 2013-03-27 12:58:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
796 +++ gnutls-3.2.3/lib/gnutls_global.h 2013-11-06 13:48:03 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
797 @@ -28,8 +28,8 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
798 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
799 int gnutls_is_secure_memory (const void *mem); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
800 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
801 -extern ASN1_TYPE _gnutls_pkix1_asn; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
802 -extern ASN1_TYPE _gnutls_gnutls_asn; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
803 +extern GNUTLS_EXPORTED ASN1_TYPE _gnutls_pkix1_asn; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
804 +extern GNUTLS_EXPORTED ASN1_TYPE _gnutls_gnutls_asn; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
805 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
806 /* removed const from node_asn* to |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
807 * prevent warnings, since libtasn1 doesn't |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
808 @@ -38,9 +38,9 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
809 #define _gnutls_get_gnutls_asn() ((ASN1_TYPE) _gnutls_gnutls_asn) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
810 #define _gnutls_get_pkix() ((ASN1_TYPE) _gnutls_pkix1_asn) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
811 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
812 -extern gnutls_log_func _gnutls_log_func; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
813 -extern gnutls_audit_log_func _gnutls_audit_log_func; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
814 -extern int _gnutls_log_level; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
815 +extern GNUTLS_EXPORTED gnutls_log_func _gnutls_log_func; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
816 +extern GNUTLS_EXPORTED gnutls_audit_log_func _gnutls_audit_log_func; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
817 +extern GNUTLS_EXPORTED int _gnutls_log_level; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
818 extern int gnutls_crypto_init (void); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
819 extern void gnutls_crypto_deinit (void); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
820 void _gnutls_priority_prefer_aes_gcm(void); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
821 diff -ur gnutls-3.2.3-orig/lib/gnutls_mpi.h gnutls-3.2.3/lib/gnutls_mpi.h |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
822 --- gnutls-3.2.3-orig/lib/gnutls_mpi.h 2013-03-27 12:58:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
823 +++ gnutls-3.2.3/lib/gnutls_mpi.h 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
824 @@ -28,7 +28,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
825 #include <crypto-backend.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
826 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
827 extern int crypto_bigint_prio; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
828 -extern gnutls_crypto_bigint_st _gnutls_mpi_ops; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
829 +extern GNUTLS_EXPORTED gnutls_crypto_bigint_st _gnutls_mpi_ops; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
830 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
831 bigint_t _gnutls_mpi_randomize (bigint_t, unsigned int bits, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
832 gnutls_rnd_level_t level); |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
833 diff -ur gnutls-3.2.3-orig/lib/gnutls_range.c gnutls-3.2.3/lib/gnutls_range.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
834 --- gnutls-3.2.3-orig/lib/gnutls_range.c 2013-07-26 01:58:21 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
835 +++ gnutls-3.2.3/lib/gnutls_range.c 2013-11-06 13:15:31 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
836 @@ -186,11 +186,13 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
837 } |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
838 else |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
839 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
840 + ssize_t this_pad; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
841 + |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
842 ret = _gnutls_range_max_lh_pad (session, orig_low, max_frag); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
843 if (ret < 0) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
844 return gnutls_assert_val(ret); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
845 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
846 - ssize_t this_pad = MIN (ret, orig_high - orig_low); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
847 + this_pad = MIN (ret, orig_high - orig_low); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
848 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
849 _gnutls_set_range (next, orig_low, orig_low + this_pad); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
850 _gnutls_set_range (remainder, 0, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
851 diff -ur gnutls-3.2.3-orig/lib/gnutls_x509.c gnutls-3.2.3/lib/gnutls_x509.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
852 --- gnutls-3.2.3-orig/lib/gnutls_x509.c 2013-07-19 04:44:08 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
853 +++ gnutls-3.2.3/lib/gnutls_x509.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
854 @@ -1725,8 +1725,10 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
855 int ca_list_size) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
856 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
857 int ret, i, j; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
858 - gnutls_x509_crt_t new_list[ca_list_size]; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
859 + gnutls_x509_crt_t * new_list; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
860 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
861 + new_list = (gnutls_x509_crt_t *) malloc (sizeof (gnutls_x509_crt_t) * |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
862 + ca_list_size); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
863 for (i = 0; i < ca_list_size; i++) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
864 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
865 ret = gnutls_x509_crt_init (&new_list[i]); |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
866 @@ -1757,12 +1759,16 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
867 goto cleanup; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
868 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
869 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
870 + free (new_list); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
871 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
872 return ret; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
873 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
874 cleanup: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
875 for (j=0;j<i;i++) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
876 gnutls_x509_crt_deinit(new_list[j]); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
877 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
878 + free (new_list); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
879 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
880 return ret; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
881 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
882 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
883 @@ -1988,7 +1994,10 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
884 int crl_list_size) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
885 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
886 int ret, i, j; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
887 - gnutls_x509_crl_t new_crl[crl_list_size]; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
888 + gnutls_x509_crl_t * new_crl; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
889 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
890 + new_crl = (gnutls_x509_crl_t *) malloc (sizeof (gnutls_x509_crl_t) * |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
891 + crl_list_size); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
892 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
893 for (i = 0; i < crl_list_size; i++) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
894 { |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
895 @@ -2014,12 +2023,16 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
896 goto cleanup; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
897 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
898 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
899 + free (new_crl); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
900 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
901 return ret; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
902 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
903 cleanup: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
904 for (j=0;j<i;j++) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
905 gnutls_x509_crl_deinit(new_crl[j]); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
906 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
907 + free (new_crl); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
908 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
909 return ret; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
910 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
911 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
912 diff -ur gnutls-3.2.3-orig/lib/includes/gnutls/gnutls.h.in gnutls-3.2.3/lib/includes/gnutls/gnutls.h.in |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
913 --- gnutls-3.2.3-orig/lib/includes/gnutls/gnutls.h.in 2013-07-25 07:33:02 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
914 +++ gnutls-3.2.3/lib/includes/gnutls/gnutls.h.in 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
915 @@ -36,6 +36,16 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
916 #ifndef GNUTLS_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
917 #define GNUTLS_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
918 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
919 +#ifdef _MSC_VER |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
920 +# ifdef GNUTLS_BUILDING |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
921 +# define GNUTLS_EXPORTED __declspec(dllexport) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
922 +# else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
923 +# define GNUTLS_EXPORTED __declspec(dllimport) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
924 +# endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
925 +#else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
926 +# define GNUTLS_EXPORTED |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
927 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
928 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
929 /* Get size_t. */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
930 #include <stddef.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
931 /* Get ssize_t. */ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
932 @@ -1436,13 +1446,13 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
933 void gnutls_global_set_time_function (gnutls_time_func time_func); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
934 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
935 /* For use in callbacks */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
936 - extern gnutls_alloc_function gnutls_malloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
937 - extern gnutls_alloc_function gnutls_secure_malloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
938 - extern gnutls_realloc_function gnutls_realloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
939 - extern gnutls_calloc_function gnutls_calloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
940 - extern gnutls_free_function gnutls_free; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
941 + extern GNUTLS_EXPORTED gnutls_alloc_function gnutls_malloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
942 + extern GNUTLS_EXPORTED gnutls_alloc_function gnutls_secure_malloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
943 + extern GNUTLS_EXPORTED gnutls_realloc_function gnutls_realloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
944 + extern GNUTLS_EXPORTED gnutls_calloc_function gnutls_calloc; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
945 + extern GNUTLS_EXPORTED gnutls_free_function gnutls_free; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
946 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
947 - extern char *(*gnutls_strdup) (const char *); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
948 + extern GNUTLS_EXPORTED char *(*gnutls_strdup) (const char *); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
949 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
950 typedef void (*gnutls_log_func) (int, const char *); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
951 typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *); |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
952 @@ -1603,20 +1613,20 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
953 /* The static parameters defined in draft-ietf-tls-srp-05 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
954 * Those should be used as input to gnutls_srp_verifier(). |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
955 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
956 - extern const gnutls_datum_t gnutls_srp_4096_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
957 - extern const gnutls_datum_t gnutls_srp_4096_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
958 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_4096_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
959 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_4096_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
960 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
961 - extern const gnutls_datum_t gnutls_srp_3072_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
962 - extern const gnutls_datum_t gnutls_srp_3072_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
963 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_3072_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
964 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_3072_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
965 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
966 - extern const gnutls_datum_t gnutls_srp_2048_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
967 - extern const gnutls_datum_t gnutls_srp_2048_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
968 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_2048_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
969 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_2048_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
970 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
971 - extern const gnutls_datum_t gnutls_srp_1536_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
972 - extern const gnutls_datum_t gnutls_srp_1536_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
973 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_1536_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
974 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_1536_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
975 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
976 - extern const gnutls_datum_t gnutls_srp_1024_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
977 - extern const gnutls_datum_t gnutls_srp_1024_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
978 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_1024_group_prime; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
979 + extern GNUTLS_EXPORTED const gnutls_datum_t gnutls_srp_1024_group_generator; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
980 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
981 typedef int gnutls_srp_server_credentials_function (gnutls_session_t, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
982 const char *username, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
983 diff -ur gnutls-3.2.3-orig/lib/includes/gnutls/gnutlsxx.h gnutls-3.2.3/lib/includes/gnutls/gnutlsxx.h |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
984 --- gnutls-3.2.3-orig/lib/includes/gnutls/gnutlsxx.h 2013-02-10 05:29:54 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
985 +++ gnutls-3.2.3/lib/includes/gnutls/gnutlsxx.h 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
986 @@ -27,10 +27,20 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
987 #include <vector> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
988 #include <gnutls/gnutls.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
989 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
990 +#ifdef _MSC_VER |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
991 +# ifdef GNUTLSXX_BUILDING |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
992 +# define GNUTLSXX_EXPORTED __declspec(dllexport) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
993 +# else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
994 +# define GNUTLSXX_EXPORTED __declspec(dllimport) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
995 +# endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
996 +#else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
997 +# define GNUTLSXX_EXPORTED |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
998 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
999 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1000 namespace gnutls |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1001 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1002 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1003 - class noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1004 + class GNUTLSXX_EXPORTED noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1005 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1006 protected: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1007 noncopyable () |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1008 @@ -47,7 +57,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1009 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1010 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1011 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1012 - class exception:public std::exception |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1013 + class GNUTLSXX_EXPORTED exception:public std::exception |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1014 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1015 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1016 exception (int x); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1017 @@ -58,7 +68,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1018 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1019 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1020 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1021 - class dh_params:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1022 + class GNUTLSXX_EXPORTED dh_params:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1023 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1024 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1025 dh_params (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1026 @@ -80,7 +90,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1027 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1028 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1029 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1030 - class rsa_params:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1031 + class GNUTLSXX_EXPORTED rsa_params:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1032 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1033 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1034 rsa_params (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1035 @@ -106,7 +116,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1036 gnutls_rsa_params_t params; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1037 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1038 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1039 - class session:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1040 + class GNUTLSXX_EXPORTED session:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1041 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1042 protected: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1043 gnutls_session_t s; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1044 @@ -220,10 +230,14 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1045 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1046 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1047 // interface for databases |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1048 - class DB:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1049 + class GNUTLSXX_EXPORTED DB:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1050 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1051 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1052 +#ifdef _MSC_VER |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1053 + virtual ~ DB () { }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1054 +#else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1055 virtual ~ DB () = 0; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1056 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1057 virtual bool store (const gnutls_datum_t & key, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1058 const gnutls_datum_t & data) = 0; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1059 virtual bool retrieve (const gnutls_datum_t & key, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1060 @@ -231,7 +245,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1061 virtual bool remove (const gnutls_datum_t & key) = 0; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1062 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1063 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1064 - class server_session:public session |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1065 + class GNUTLSXX_EXPORTED server_session:public session |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1066 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1067 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1068 server_session (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1069 @@ -255,7 +269,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1070 void set_certificate_request (gnutls_certificate_request_t); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1071 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1072 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1073 - class client_session:public session |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1074 + class GNUTLSXX_EXPORTED client_session:public session |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1075 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1076 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1077 client_session (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1078 @@ -268,7 +282,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1079 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1080 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1081 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1082 - class credentials:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1083 + class GNUTLSXX_EXPORTED credentials:private noncopyable |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1084 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1085 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1086 virtual ~ credentials () |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1087 @@ -285,7 +299,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1088 void *cred; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1089 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1090 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1091 - class certificate_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1092 + class GNUTLSXX_EXPORTED certificate_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1093 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1094 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1095 ~certificate_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1096 @@ -332,13 +346,13 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1097 gnutls_certificate_credentials_t cred; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1098 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1099 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1100 - class certificate_server_credentials:public certificate_credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1101 + class GNUTLSXX_EXPORTED certificate_server_credentials:public certificate_credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1102 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1103 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1104 void set_params_function (gnutls_params_function * func); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1105 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1106 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1107 - class certificate_client_credentials:public certificate_credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1108 + class GNUTLSXX_EXPORTED certificate_client_credentials:public certificate_credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1109 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1110 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1111 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1112 @@ -346,7 +360,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1113 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1114 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1115 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1116 - class anon_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1117 + class GNUTLSXX_EXPORTED anon_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1118 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1119 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1120 anon_server_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1121 @@ -357,7 +371,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1122 gnutls_anon_server_credentials_t cred; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1123 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1124 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1125 - class anon_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1126 + class GNUTLSXX_EXPORTED anon_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1127 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1128 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1129 anon_client_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1130 @@ -367,7 +381,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1131 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1132 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1133 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1134 - class srp_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1135 + class GNUTLSXX_EXPORTED srp_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1136 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1137 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1138 srp_server_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1139 @@ -380,7 +394,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1140 gnutls_srp_server_credentials_t cred; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1141 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1142 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1143 - class srp_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1144 + class GNUTLSXX_EXPORTED srp_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1145 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1146 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1147 srp_client_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1148 @@ -393,7 +407,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1149 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1150 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1151 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1152 - class psk_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1153 + class GNUTLSXX_EXPORTED psk_server_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1154 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1155 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1156 psk_server_credentials (); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1157 @@ -407,7 +421,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1158 gnutls_psk_server_credentials_t cred; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1159 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1160 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1161 - class psk_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1162 + class GNUTLSXX_EXPORTED psk_client_credentials:public credentials |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1163 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1164 public: |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1165 psk_client_credentials (); |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1166 diff -ur gnutls-3.2.3-orig/lib/minitasn1/Makefile.am gnutls-3.2.3/lib/minitasn1/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1167 --- gnutls-3.2.3-orig/lib/minitasn1/Makefile.am 2012-12-03 14:36:50 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1168 +++ gnutls-3.2.3/lib/minitasn1/Makefile.am 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1169 @@ -21,6 +21,8 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1170 # MA 02110-1301, USA |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1171 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1172 AM_CPPFLAGS = -DASN1_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1173 + -DASN1_STATIC \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1174 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1175 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1176 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1177 -I$(srcdir)/.. |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1178 diff -ur gnutls-3.2.3-orig/lib/minitasn1/coding.c gnutls-3.2.3/lib/minitasn1/coding.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1179 --- gnutls-3.2.3-orig/lib/minitasn1/coding.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1180 +++ gnutls-3.2.3/lib/minitasn1/coding.c 2013-11-06 13:11:34 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1181 @@ -519,28 +519,44 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1182 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1183 const tag_and_class_st _asn1_tags[] = |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1184 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1185 - [ASN1_ETYPE_GENERALSTRING] = {ASN1_TAG_GENERALSTRING, ASN1_CLASS_UNIVERSAL, "type:GENERALSTRING"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1186 - [ASN1_ETYPE_NUMERIC_STRING] = {ASN1_TAG_NUMERIC_STRING, ASN1_CLASS_UNIVERSAL, "type:NUMERIC_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1187 - [ASN1_ETYPE_IA5_STRING] = {ASN1_TAG_IA5_STRING, ASN1_CLASS_UNIVERSAL, "type:IA5_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1188 - [ASN1_ETYPE_TELETEX_STRING] = {ASN1_TAG_TELETEX_STRING, ASN1_CLASS_UNIVERSAL, "type:TELETEX_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1189 - [ASN1_ETYPE_PRINTABLE_STRING] = {ASN1_TAG_PRINTABLE_STRING, ASN1_CLASS_UNIVERSAL, "type:PRINTABLE_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1190 - [ASN1_ETYPE_UNIVERSAL_STRING] = {ASN1_TAG_UNIVERSAL_STRING, ASN1_CLASS_UNIVERSAL, "type:UNIVERSAL_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1191 - [ASN1_ETYPE_BMP_STRING] = {ASN1_TAG_BMP_STRING, ASN1_CLASS_UNIVERSAL, "type:BMP_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1192 - [ASN1_ETYPE_UTF8_STRING] = {ASN1_TAG_UTF8_STRING, ASN1_CLASS_UNIVERSAL, "type:UTF8_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1193 - [ASN1_ETYPE_VISIBLE_STRING] = {ASN1_TAG_VISIBLE_STRING, ASN1_CLASS_UNIVERSAL, "type:VISIBLE_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1194 - [ASN1_ETYPE_OCTET_STRING] = {ASN1_TAG_OCTET_STRING, ASN1_CLASS_UNIVERSAL, "type:OCT_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1195 - [ASN1_ETYPE_BIT_STRING] = {ASN1_TAG_BIT_STRING, ASN1_CLASS_UNIVERSAL, "type:BIT_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1196 - [ASN1_ETYPE_OBJECT_ID] = {ASN1_TAG_OBJECT_ID, ASN1_CLASS_UNIVERSAL, "type:OBJ_ID"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1197 - [ASN1_ETYPE_NULL] = {ASN1_TAG_NULL, ASN1_CLASS_UNIVERSAL, "type:NULL"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1198 - [ASN1_ETYPE_BOOLEAN] = {ASN1_TAG_BOOLEAN, ASN1_CLASS_UNIVERSAL, "type:BOOLEAN"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1199 - [ASN1_ETYPE_INTEGER] = {ASN1_TAG_INTEGER, ASN1_CLASS_UNIVERSAL, "type:INTEGER"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1200 - [ASN1_ETYPE_ENUMERATED] = {ASN1_TAG_ENUMERATED, ASN1_CLASS_UNIVERSAL, "type:ENUMERATED"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1201 - [ASN1_ETYPE_SEQUENCE] = {ASN1_TAG_SEQUENCE, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SEQUENCE"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1202 - [ASN1_ETYPE_SEQUENCE_OF] ={ASN1_TAG_SEQUENCE, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SEQ_OF"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1203 - [ASN1_ETYPE_SET] = {ASN1_TAG_SET, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SET"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1204 - [ASN1_ETYPE_SET_OF] = {ASN1_TAG_SET, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SET_OF"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1205 - [ASN1_ETYPE_GENERALIZED_TIME] = {ASN1_TAG_GENERALIZEDTime, ASN1_CLASS_UNIVERSAL, "type:GENERALIZED_TIME"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1206 - [ASN1_ETYPE_UTC_TIME] = {ASN1_TAG_UTCTime, ASN1_CLASS_UNIVERSAL, "type:UTC_TIME"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1207 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1208 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1209 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1210 + /*[ASN1_ETYPE_INTEGER] =*/ {ASN1_TAG_INTEGER, ASN1_CLASS_UNIVERSAL, "type:INTEGER"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1211 + /*[ASN1_ETYPE_BOOLEAN] =*/ {ASN1_TAG_BOOLEAN, ASN1_CLASS_UNIVERSAL, "type:BOOLEAN"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1212 + /*[ASN1_ETYPE_SEQUENCE] =*/ {ASN1_TAG_SEQUENCE, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SEQUENCE"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1213 + /*[ASN1_ETYPE_BIT_STRING] =*/ {ASN1_TAG_BIT_STRING, ASN1_CLASS_UNIVERSAL, "type:BIT_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1214 + /*[ASN1_ETYPE_OCTET_STRING] =*/ {ASN1_TAG_OCTET_STRING, ASN1_CLASS_UNIVERSAL, "type:OCT_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1215 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1216 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1217 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1218 + /*[ASN1_ETYPE_SEQUENCE_OF] =*/{ASN1_TAG_SEQUENCE, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SEQ_OF"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1219 + /*[ASN1_ETYPE_OBJECT_ID] =*/ {ASN1_TAG_OBJECT_ID, ASN1_CLASS_UNIVERSAL, "type:OBJ_ID"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1220 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1221 + /*[ASN1_ETYPE_SET] =*/ {ASN1_TAG_SET, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SET"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1222 + /*[ASN1_ETYPE_SET_OF] =*/ {ASN1_TAG_SET, ASN1_CLASS_UNIVERSAL | ASN1_CLASS_STRUCTURED, "type:SET_OF"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1223 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1224 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1225 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1226 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1227 + /*[ASN1_ETYPE_NULL] =*/ {ASN1_TAG_NULL, ASN1_CLASS_UNIVERSAL, "type:NULL"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1228 + /*[ASN1_ETYPE_ENUMERATED] =*/ {ASN1_TAG_ENUMERATED, ASN1_CLASS_UNIVERSAL, "type:ENUMERATED"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1229 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1230 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1231 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1232 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1233 + { 0, 0, NULL }, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1234 + /*[ASN1_ETYPE_GENERALSTRING] =*/ {ASN1_TAG_GENERALSTRING, ASN1_CLASS_UNIVERSAL, "type:GENERALSTRING"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1235 + /*[ASN1_ETYPE_NUMERIC_STRING] =*/ {ASN1_TAG_NUMERIC_STRING, ASN1_CLASS_UNIVERSAL, "type:NUMERIC_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1236 + /*[ASN1_ETYPE_IA5_STRING] =*/ {ASN1_TAG_IA5_STRING, ASN1_CLASS_UNIVERSAL, "type:IA5_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1237 + /*[ASN1_ETYPE_TELETEX_STRING] =*/ {ASN1_TAG_TELETEX_STRING, ASN1_CLASS_UNIVERSAL, "type:TELETEX_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1238 + /*[ASN1_ETYPE_PRINTABLE_STRING] =*/ {ASN1_TAG_PRINTABLE_STRING, ASN1_CLASS_UNIVERSAL, "type:PRINTABLE_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1239 + /*[ASN1_ETYPE_UNIVERSAL_STRING] =*/ {ASN1_TAG_UNIVERSAL_STRING, ASN1_CLASS_UNIVERSAL, "type:UNIVERSAL_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1240 + /*[ASN1_ETYPE_BMP_STRING] =*/ {ASN1_TAG_BMP_STRING, ASN1_CLASS_UNIVERSAL, "type:BMP_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1241 + /*[ASN1_ETYPE_UTF8_STRING] =*/ {ASN1_TAG_UTF8_STRING, ASN1_CLASS_UNIVERSAL, "type:UTF8_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1242 + /*[ASN1_ETYPE_VISIBLE_STRING] =*/ {ASN1_TAG_VISIBLE_STRING, ASN1_CLASS_UNIVERSAL, "type:VISIBLE_STR"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1243 + /*[ASN1_ETYPE_UTC_TIME] =*/ {ASN1_TAG_UTCTime, ASN1_CLASS_UNIVERSAL, "type:UTC_TIME"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1244 + /*[ASN1_ETYPE_GENERALIZED_TIME] =*/ {ASN1_TAG_GENERALIZEDTime, ASN1_CLASS_UNIVERSAL, "type:GENERALIZED_TIME"}, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1245 }; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1246 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1247 unsigned int _asn1_tags_size = sizeof(_asn1_tags)/sizeof(_asn1_tags[0]); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1248 diff -ur gnutls-3.2.3-orig/lib/nettle/Makefile.am gnutls-3.2.3/lib/nettle/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1249 --- gnutls-3.2.3-orig/lib/nettle/Makefile.am 2013-06-19 13:05:19 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1250 +++ gnutls-3.2.3/lib/nettle/Makefile.am 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1251 @@ -24,6 +24,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1252 $(GMP_CFLAGS) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1253 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1254 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1255 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1256 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1257 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1258 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1259 diff -ur gnutls-3.2.3-orig/lib/nettle/cipher.c gnutls-3.2.3/lib/nettle/cipher.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1260 --- gnutls-3.2.3-orig/lib/nettle/cipher.c 2013-05-27 18:19:21 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1261 +++ gnutls-3.2.3/lib/nettle/cipher.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1262 @@ -394,13 +394,13 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1263 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1264 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1265 gnutls_crypto_cipher_st _gnutls_cipher_ops = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1266 - .init = wrap_nettle_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1267 - .exists = wrap_nettle_cipher_exists, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1268 - .setiv = wrap_nettle_cipher_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1269 - .setkey = wrap_nettle_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1270 - .encrypt = wrap_nettle_cipher_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1271 - .decrypt = wrap_nettle_cipher_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1272 - .deinit = wrap_nettle_cipher_close, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1273 - .auth = wrap_nettle_cipher_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1274 - .tag = wrap_nettle_cipher_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1275 + wrap_nettle_cipher_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1276 + wrap_nettle_cipher_setkey, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1277 + wrap_nettle_cipher_setiv, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1278 + wrap_nettle_cipher_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1279 + wrap_nettle_cipher_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1280 + wrap_nettle_cipher_auth, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1281 + wrap_nettle_cipher_tag, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1282 + wrap_nettle_cipher_close, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1283 + wrap_nettle_cipher_exists |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1284 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1285 diff -ur gnutls-3.2.3-orig/lib/nettle/mac.c gnutls-3.2.3/lib/nettle/mac.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1286 --- gnutls-3.2.3-orig/lib/nettle/mac.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1287 +++ gnutls-3.2.3/lib/nettle/mac.c 2013-11-06 09:49:12 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1288 @@ -448,21 +448,21 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1289 } |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1290 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1291 gnutls_crypto_mac_st _gnutls_mac_ops = { |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1292 - .init = wrap_nettle_mac_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1293 - .setkey = wrap_nettle_mac_set_key, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1294 - .setnonce = wrap_nettle_mac_set_nonce, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1295 - .hash = wrap_nettle_mac_update, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1296 - .output = wrap_nettle_mac_output, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1297 - .deinit = wrap_nettle_mac_deinit, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1298 - .fast = wrap_nettle_mac_fast, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1299 - .exists = wrap_nettle_mac_exists, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1300 + /*.init =*/ wrap_nettle_mac_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1301 + /*.setkey =*/ wrap_nettle_mac_set_key, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1302 + /*.setnonce =*/ wrap_nettle_mac_set_nonce, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1303 + /*.hash =*/ wrap_nettle_mac_update, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1304 + /*.output =*/ wrap_nettle_mac_output, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1305 + /*.deinit =*/ wrap_nettle_mac_deinit, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1306 + /*.fast =*/ wrap_nettle_mac_fast, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1307 + /*.exists =*/ wrap_nettle_mac_exists, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1308 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1309 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1310 gnutls_crypto_digest_st _gnutls_digest_ops = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1311 - .init = wrap_nettle_hash_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1312 - .hash = wrap_nettle_hash_update, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1313 - .output = wrap_nettle_hash_output, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1314 - .deinit = wrap_nettle_hash_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1315 - .fast = wrap_nettle_hash_fast, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1316 - .exists = wrap_nettle_hash_exists, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1317 + /*.init =*/ wrap_nettle_hash_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1318 + /*.hash =*/ wrap_nettle_hash_update, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1319 + /*.output =*/ wrap_nettle_hash_output, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1320 + /*.deinit =*/ wrap_nettle_hash_deinit, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1321 + /*.fast =*/ wrap_nettle_hash_fast, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1322 + /*.exists =*/ wrap_nettle_hash_exists, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1323 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1324 diff -ur gnutls-3.2.3-orig/lib/nettle/mpi.c gnutls-3.2.3/lib/nettle/mpi.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1325 --- gnutls-3.2.3-orig/lib/nettle/mpi.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1326 +++ gnutls-3.2.3/lib/nettle/mpi.c 2013-11-06 09:55:25 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1327 @@ -625,28 +625,28 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1328 int crypto_bigint_prio = INT_MAX; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1329 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1330 gnutls_crypto_bigint_st _gnutls_mpi_ops = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1331 - .bigint_new = wrap_nettle_mpi_new, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1332 - .bigint_cmp = wrap_nettle_mpi_cmp, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1333 - .bigint_cmp_ui = wrap_nettle_mpi_cmp_ui, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1334 - .bigint_mod = wrap_nettle_mpi_mod, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1335 - .bigint_set = wrap_nettle_mpi_set, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1336 - .bigint_set_ui = wrap_nettle_mpi_set_ui, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1337 - .bigint_get_nbits = wrap_nettle_mpi_get_nbits, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1338 - .bigint_powm = wrap_nettle_mpi_powm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1339 - .bigint_addm = wrap_nettle_mpi_addm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1340 - .bigint_subm = wrap_nettle_mpi_subm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1341 - .bigint_add = wrap_nettle_mpi_add, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1342 - .bigint_sub = wrap_nettle_mpi_sub, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1343 - .bigint_add_ui = wrap_nettle_mpi_add_ui, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1344 - .bigint_sub_ui = wrap_nettle_mpi_sub_ui, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1345 - .bigint_mul = wrap_nettle_mpi_mul, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1346 - .bigint_mulm = wrap_nettle_mpi_mulm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1347 - .bigint_mul_ui = wrap_nettle_mpi_mul_ui, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1348 - .bigint_div = wrap_nettle_mpi_div, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1349 - .bigint_prime_check = wrap_nettle_prime_check, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1350 - .bigint_release = wrap_nettle_mpi_release, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1351 - .bigint_clear = wrap_nettle_mpi_clear, |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1352 - .bigint_print = wrap_nettle_mpi_print, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1353 - .bigint_scan = wrap_nettle_mpi_scan, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1354 - .bigint_generate_group = wrap_nettle_generate_group |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1355 + /*.bigint_new =*/ wrap_nettle_mpi_new, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1356 + /*.bigint_release =*/ wrap_nettle_mpi_release, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1357 + /*.bigint_clear =*/ wrap_nettle_mpi_clear, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1358 + /*.bigint_cmp =*/ wrap_nettle_mpi_cmp, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1359 + /*.bigint_cmp_ui =*/ wrap_nettle_mpi_cmp_ui, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1360 + /*.bigint_mod =*/ wrap_nettle_mpi_mod, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1361 + /*.bigint_set =*/ wrap_nettle_mpi_set, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1362 + /*.bigint_set_ui =*/ wrap_nettle_mpi_set_ui, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1363 + /*.bigint_get_nbits =*/ wrap_nettle_mpi_get_nbits, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1364 + /*.bigint_powm =*/ wrap_nettle_mpi_powm, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1365 + /*.bigint_addm =*/ wrap_nettle_mpi_addm, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1366 + /*.bigint_subm =*/ wrap_nettle_mpi_subm, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1367 + /*.bigint_mulm =*/ wrap_nettle_mpi_mulm, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1368 + /*.bigint_add =*/ wrap_nettle_mpi_add, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1369 + /*.bigint_sub =*/ wrap_nettle_mpi_sub, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1370 + /*.bigint_mul =*/ wrap_nettle_mpi_mul, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1371 + /*.bigint_add_ui =*/ wrap_nettle_mpi_add_ui, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1372 + /*.bigint_sub_ui =*/ wrap_nettle_mpi_sub_ui, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1373 + /*.bigint_mul_ui =*/ wrap_nettle_mpi_mul_ui, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1374 + /*.bigint_div =*/ wrap_nettle_mpi_div, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1375 + /*.bigint_prime_check =*/ wrap_nettle_prime_check, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1376 + /*.bigint_generate_group =*/ wrap_nettle_generate_group, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1377 + /*.bigint_scan =*/ wrap_nettle_mpi_scan, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1378 + /*.bigint_print =*/ wrap_nettle_mpi_print |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1379 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1380 diff -ur gnutls-3.2.3-orig/lib/nettle/pk.c gnutls-3.2.3/lib/nettle/pk.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1381 --- gnutls-3.2.3-orig/lib/nettle/pk.c 2013-05-26 06:01:21 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1382 +++ gnutls-3.2.3/lib/nettle/pk.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1383 @@ -1158,13 +1158,13 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1384 int crypto_pk_prio = INT_MAX; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1385 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1386 gnutls_crypto_pk_st _gnutls_pk_ops = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1387 - .hash_algorithm = wrap_nettle_hash_algorithm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1388 - .encrypt = _wrap_nettle_pk_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1389 - .decrypt = _wrap_nettle_pk_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1390 - .sign = _wrap_nettle_pk_sign, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1391 - .verify = _wrap_nettle_pk_verify, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1392 - .verify_params = wrap_nettle_pk_verify_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1393 - .generate = wrap_nettle_pk_generate_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1394 - .pk_fixup_private_params = wrap_nettle_pk_fixup, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1395 - .derive = _wrap_nettle_pk_derive, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1396 + _wrap_nettle_pk_encrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1397 + _wrap_nettle_pk_decrypt, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1398 + _wrap_nettle_pk_sign, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1399 + _wrap_nettle_pk_verify, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1400 + wrap_nettle_hash_algorithm, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1401 + wrap_nettle_pk_verify_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1402 + wrap_nettle_pk_generate_params, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1403 + wrap_nettle_pk_fixup, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1404 + _wrap_nettle_pk_derive |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1405 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1406 diff -ur gnutls-3.2.3-orig/lib/nettle/rnd.c gnutls-3.2.3/lib/nettle/rnd.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1407 --- gnutls-3.2.3-orig/lib/nettle/rnd.c 2013-05-25 06:12:26 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1408 +++ gnutls-3.2.3/lib/nettle/rnd.c 2013-11-06 09:56:48 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1409 @@ -485,8 +485,8 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1410 int crypto_rnd_prio = INT_MAX; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1411 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1412 gnutls_crypto_rnd_st _gnutls_rnd_ops = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1413 - .init = wrap_nettle_rnd_init, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1414 - .deinit = wrap_nettle_rnd_deinit, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1415 - .rnd = wrap_nettle_rnd, |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1416 - .rnd_refresh = wrap_nettle_rnd_refresh, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1417 + /*.init =*/ wrap_nettle_rnd_init, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1418 + /*.rnd =*/ wrap_nettle_rnd, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1419 + /*.rnd_refresh =*/ wrap_nettle_rnd_refresh, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1420 + /*.deinit =*/ wrap_nettle_rnd_deinit |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1421 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1422 diff -ur gnutls-3.2.3-orig/lib/opencdk/Makefile.am gnutls-3.2.3/lib/opencdk/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1423 --- gnutls-3.2.3-orig/lib/opencdk/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1424 +++ gnutls-3.2.3/lib/opencdk/Makefile.am 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1425 @@ -21,6 +21,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1426 AM_CFLAGS = $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1427 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1428 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1429 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1430 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1431 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1432 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1433 diff -ur gnutls-3.2.3-orig/lib/openpgp/Makefile.am gnutls-3.2.3/lib/openpgp/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1434 --- gnutls-3.2.3-orig/lib/openpgp/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1435 +++ gnutls-3.2.3/lib/openpgp/Makefile.am 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1436 @@ -20,6 +20,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1437 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1438 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1439 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1440 + -DGNUTLS_BUILDING \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1441 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1442 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1443 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1444 diff -ur gnutls-3.2.3-orig/lib/tpm.c gnutls-3.2.3/lib/tpm.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1445 --- gnutls-3.2.3-orig/lib/tpm.c 2013-05-25 06:09:44 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1446 +++ gnutls-3.2.3/lib/tpm.c 2013-11-06 13:25:56 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1447 @@ -27,10 +27,10 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1448 * Carolin Latze <latze@angry-red-pla.net> and Tobias Soder |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1449 */ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1450 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1451 +#include <gnutls_int.h> |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1452 #include <gnutls/gnutls.h> |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1453 #include <gnutls/abstract.h> |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1454 #include <gnutls/tpm.h> |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1455 -#include <gnutls_int.h> |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1456 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1457 #ifdef HAVE_TROUSERS |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1458 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1459 diff -ur gnutls-3.2.3-orig/lib/x509/Makefile.am gnutls-3.2.3/lib/x509/Makefile.am |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1460 --- gnutls-3.2.3-orig/lib/x509/Makefile.am 2013-06-06 17:13:52 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1461 +++ gnutls-3.2.3/lib/x509/Makefile.am 2013-11-06 13:34:31 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1462 @@ -18,6 +18,8 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1463 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1464 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1465 AM_CPPFLAGS = \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1466 + -DGNUTLS_BUILDING \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1467 + -DASN1_STATIC \ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1468 -I$(srcdir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1469 -I$(builddir)/../../gl \ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1470 -I$(srcdir)/../includes \ |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1471 diff -ur gnutls-3.2.3-orig/src/benchmark-cipher.c gnutls-3.2.3/src/benchmark-cipher.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1472 --- gnutls-3.2.3-orig/src/benchmark-cipher.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1473 +++ gnutls-3.2.3/src/benchmark-cipher.c 2013-11-06 14:39:15 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1474 @@ -201,9 +201,10 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1475 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1476 void benchmark_cipher (int init, int debug_level) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1477 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1478 + int size = 16; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1479 + |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1480 gnutls_global_set_log_function (tls_log_func); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1481 gnutls_global_set_log_level (debug_level); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1482 - int size = 16; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1483 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1484 if (init) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1485 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1486 diff -ur gnutls-3.2.3-orig/src/cli.c gnutls-3.2.3/src/cli.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1487 --- gnutls-3.2.3-orig/src/cli.c 2013-06-10 13:24:12 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1488 +++ gnutls-3.2.3/src/cli.c 2013-11-06 14:43:12 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1489 @@ -668,7 +668,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1490 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1491 unsigned proto_n = STACKCT_OPT(ALPN); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1492 char** protos = (void*)STACKLST_OPT(ALPN); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1493 - gnutls_datum_t p[proto_n]; |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1494 + gnutls_datum_t* p = _alloca(proto_n * sizeof(gnutls_datum_t)); |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1495 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1496 for (i=0;i<proto_n;i++) |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1497 { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1498 diff -ur gnutls-3.2.3-orig/src/libopts/autoopts/options.h gnutls-3.2.3/src/libopts/autoopts/options.h |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1499 --- gnutls-3.2.3-orig/src/libopts/autoopts/options.h 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1500 +++ gnutls-3.2.3/src/libopts/autoopts/options.h 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1501 @@ -64,7 +64,7 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1502 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1503 # if defined(HAVE_STDBOOL_H) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1504 # include <stdbool.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1505 -# else |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1506 +# elif !defined(_GL_STDBOOL_H) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1507 typedef enum { false = 0, true = 1 } _Bool; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1508 # define bool _Bool |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1509 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1510 diff -ur gnutls-3.2.3-orig/src/libopts/autoopts.c gnutls-3.2.3/src/libopts/autoopts.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1511 --- gnutls-3.2.3-orig/src/libopts/autoopts.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1512 +++ gnutls-3.2.3/src/libopts/autoopts.c 2013-11-06 10:12:59 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1513 @@ -96,10 +96,18 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1514 # include "compat/pathfind.c" |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1515 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1516 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1517 +#ifdef _MSC_VER |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1518 +# define fprintf _fprintf_p |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1519 +# define snprintf _sprintf_p |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1520 +# define vsnprintf _vsprintf_p |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1521 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1522 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1523 #ifndef HAVE_SNPRINTF |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1524 -# define vsnprintf option_vsnprintf |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1525 -# define snprintf option_snprintf |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1526 -# include "compat/snprintf.c" |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1527 +# ifndef _MSC_VER |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1528 +# define vsnprintf option_vsnprintf |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1529 +# define snprintf option_snprintf |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1530 +# include "compat/snprintf.c" |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1531 +# endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1532 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1533 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1534 #ifndef HAVE_STRDUP |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1535 diff -ur gnutls-3.2.3-orig/src/libopts/compat/compat.h gnutls-3.2.3/src/libopts/compat/compat.h |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1536 --- gnutls-3.2.3-orig/src/libopts/compat/compat.h 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1537 +++ gnutls-3.2.3/src/libopts/compat/compat.h 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1538 @@ -59,7 +59,9 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1539 #ifdef HAVE_SYS_MMAN_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1540 # include <sys/mman.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1541 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1542 -#include <sys/param.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1543 +#if HAVE_SYS_PARAM_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1544 +# include <sys/param.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1545 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1546 #if HAVE_SYS_PROCSET_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1547 # include <sys/procset.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1548 #endif |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1549 @@ -328,7 +330,9 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1550 # define HAVE_WINT_T 1 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1551 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1552 #ifndef HAVE_PID_T |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1553 +# ifndef pid_t |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1554 typedef signed int pid_t; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1555 +# endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1556 # define HAVE_PID_T 1 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1557 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1558 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1559 diff -ur gnutls-3.2.3-orig/src/libopts/compat/pathfind.c gnutls-3.2.3/src/libopts/compat/pathfind.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1560 --- gnutls-3.2.3-orig/src/libopts/compat/pathfind.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1561 +++ gnutls-3.2.3/src/libopts/compat/pathfind.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1562 @@ -13,6 +13,11 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1563 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1564 #include "compat.h" |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1565 #ifndef HAVE_PATHFIND |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1566 +#if defined(_MSC_VER) && !defined(R_OK) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1567 +# define X_OK 1 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1568 +# define W_OK 2 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1569 +# define R_OK 4 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1570 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1571 #if defined(__windows__) && !defined(__CYGWIN__) |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1572 static char * |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1573 pathfind( char const * path, |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1574 diff -ur gnutls-3.2.3-orig/src/libopts/configfile.c gnutls-3.2.3/src/libopts/configfile.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1575 --- gnutls-3.2.3-orig/src/libopts/configfile.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1576 +++ gnutls-3.2.3/src/libopts/configfile.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1577 @@ -28,6 +28,11 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1578 * 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.mbsd |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1579 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1580 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1581 +#ifndef S_ISDIR |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1582 +# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1583 +# define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1584 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1585 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1586 /* = = = START-STATIC-FORWARD = = = */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1587 static void |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1588 file_preset(tOptions * opts, char const * fname, int dir); |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1589 diff -ur gnutls-3.2.3-orig/src/libopts/m4/libopts.m4 gnutls-3.2.3/src/libopts/m4/libopts.m4 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1590 --- gnutls-3.2.3-orig/src/libopts/m4/libopts.m4 2013-05-21 14:26:32 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1591 +++ gnutls-3.2.3/src/libopts/m4/libopts.m4 2013-11-06 11:31:21 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1592 @@ -72,7 +72,7 @@ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1593 ${lo_have_typ_hdr} || \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1594 ]AC_MSG_ERROR([you must have inttypes.h or stdint.h on your system])[ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1595 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1596 - for f in sys_types sys_param sys_stat \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1597 + for f in sys_types sys_stat \ |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1598 string errno stdlib memory setjmp |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1599 do eval as_ac_var=\${ac_cv_header_${f}_h} |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1600 test "X${as_ac_var}" = Xyes || { |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1601 diff -ur gnutls-3.2.3-orig/tests/cert-tests/dane gnutls-3.2.3/tests/cert-tests/dane |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1602 --- gnutls-3.2.3-orig/tests/cert-tests/dane 2013-02-27 11:28:17 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1603 +++ gnutls-3.2.3/tests/cert-tests/dane 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1604 @@ -27,6 +27,10 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1605 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1606 test -e $DANETOOL || exit 77 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1607 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1608 +if test ! -x "$DANETOOL"; then |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1609 + exit 77 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1610 +fi |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1611 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1612 $DANETOOL --tlsa-rr --load-certificate $srcdir/cert-ecc256.pem --host www.example.com --outfile tmp-dane.rr 2>/dev/null |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1613 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1614 diff $srcdir/dane-test.rr tmp-dane.rr |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1615 diff -ur gnutls-3.2.3-orig/tests/chainverify.c gnutls-3.2.3/tests/chainverify.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1616 --- gnutls-3.2.3-orig/tests/chainverify.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1617 +++ gnutls-3.2.3/tests/chainverify.c 2013-11-06 09:39:58 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1618 @@ -803,6 +803,8 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1619 * systems only. Disable it on windows. |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1620 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1621 #ifdef _WIN32 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1622 + if (debug) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1623 + success ("Ignoring test under Win32\n"); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1624 exit(77); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1625 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1626 |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1627 diff -ur gnutls-3.2.3-orig/tests/openpgp-auth.c gnutls-3.2.3/tests/openpgp-auth.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1628 --- gnutls-3.2.3-orig/tests/openpgp-auth.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1629 +++ gnutls-3.2.3/tests/openpgp-auth.c 2013-11-06 09:39:58 -0500 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1630 @@ -309,6 +309,8 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1631 void |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1632 doit () |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1633 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1634 + if (debug) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1635 + success ("Ignoring test on Win32 platform\n"); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1636 exit (77); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1637 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1638 #endif |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1639 diff -ur gnutls-3.2.3-orig/tests/openpgp-auth2.c gnutls-3.2.3/tests/openpgp-auth2.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1640 --- gnutls-3.2.3-orig/tests/openpgp-auth2.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1641 +++ gnutls-3.2.3/tests/openpgp-auth2.c 2013-11-06 09:39:59 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1642 @@ -23,12 +23,13 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1643 #include <config.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1644 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1645 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1646 -#if !defined(_WIN32) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1647 - |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1648 #include <gnutls/gnutls.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1649 #include <gnutls/openpgp.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1650 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1651 #include "utils.h" |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1652 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1653 +#if !defined(_WIN32) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1654 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1655 #include <read-file.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1656 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1657 #include <unistd.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1658 @@ -262,6 +263,8 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1659 void |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1660 doit () |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1661 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1662 + if (debug) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1663 + success ("Ignoring test on Win32 platform\n"); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1664 exit (77); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1665 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1666 #endif |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1667 diff -ur gnutls-3.2.3-orig/tests/rng-fork.c gnutls-3.2.3/tests/rng-fork.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1668 --- gnutls-3.2.3-orig/tests/rng-fork.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1669 +++ gnutls-3.2.3/tests/rng-fork.c 2013-11-06 09:39:59 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1670 @@ -107,6 +107,8 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1671 void |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1672 doit (void) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1673 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1674 + if (debug) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1675 + success ("Ignoring test on Win32 platform\n"); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1676 exit (77); |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1677 } |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1678 #endif |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1679 diff -ur gnutls-3.2.3-orig/tests/slow/cipher-test.c gnutls-3.2.3/tests/slow/cipher-test.c |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1680 --- gnutls-3.2.3-orig/tests/slow/cipher-test.c 2013-05-08 14:32:30 -0400 |
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1681 +++ gnutls-3.2.3/tests/slow/cipher-test.c 2013-11-06 09:39:59 -0500 |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1682 @@ -1,3 +1,7 @@ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1683 +#ifdef HAVE_CONFIG_H |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1684 +#include <config.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1685 +#endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1686 + |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1687 #include <stdint.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1688 #include <stdio.h> |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1689 #include <string.h> |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1690 @@ -45,75 +49,74 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1691 "\x58\xe2\xfc\xce\xfa\x7e\x30\x61\x36\x7f\x1d\x57\xa4\xe7\x45\x5a"}, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1692 #endif |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1693 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1694 - .key = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1695 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1696 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1697 - .auth = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1698 - .auth_size = 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1699 - .plaintext = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1700 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1701 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1702 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1703 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1704 - .plaintext_size = 16, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1705 - .ciphertext = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1706 + 16, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1707 + (void*)"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1708 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1709 "\x03\x88\xda\xce\x60\xb6\xa3\x92\xf3\x28\xc2\xb9\x71\xb2\xfe\x78", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1710 - .iv = (void*)"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1711 - .tag = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1712 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1713 "\xab\x6e\x47\xd4\x2c\xec\x13\xbd\xf5\x3a\x67\xb2\x12\x57\xbd\xdf"}, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1714 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1715 - .key = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1716 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1717 "\xfe\xff\xe9\x92\x86\x65\x73\x1c\x6d\x6a\x8f\x94\x67\x30\x83\x08", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1718 - .auth = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1719 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1720 "\xfe\xed\xfa\xce\xde\xad\xbe\xef\xfe\xed\xfa\xce\xde\xad\xbe\xef\xab\xad\xda\xd2", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1721 - .auth_size = 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1722 - .plaintext = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1723 + 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1724 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1725 "\xd9\x31\x32\x25\xf8\x84\x06\xe5\xa5\x59\x09\xc5\xaf\xf5\x26\x9a\x86\xa7\xa9\x53\x15\x34\xf7\xda\x2e\x4c\x30\x3d\x8a\x31\x8a\x72\x1c\x3c\x0c\x95\x95\x68\x09\x53\x2f\xcf\x0e\x24\x49\xa6\xb5\x25\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57\xba\x63\x7b\x39", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1726 - .plaintext_size = 60, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1727 - .ciphertext = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1728 + 60, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1729 + (void*)"\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1730 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1731 "\x42\x83\x1e\xc2\x21\x77\x74\x24\x4b\x72\x21\xb7\x84\xd0\xd4\x9c\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0\x35\xc1\x7e\x23\x29\xac\xa1\x2e\x21\xd5\x14\xb2\x54\x66\x93\x1c\x7d\x8f\x6a\x5a\xac\x84\xaa\x05\x1b\xa3\x0b\x39\x6a\x0a\xac\x97\x3d\x58\xe0\x91", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1732 - .iv = (void*)"\xca\xfe\xba\xbe\xfa\xce\xdb\xad\xde\xca\xf8\x88", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1733 - .tag = (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1734 + (void*) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1735 "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb\x94\xfa\xe9\x5a\xe7\x12\x1a\x47"} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1736 }; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1737 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1738 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1739 struct aes_vectors_st aes_vectors[] = { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1740 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1741 - .key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1742 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1743 "\xc0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1744 - .plaintext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1745 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1746 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1747 - .ciphertext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1748 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1749 "\x4b\xc3\xf8\x83\x45\x0c\x11\x3c\x64\xca\x42\xe1\x11\x2a\x9e\x87", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1750 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1751 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1752 - .key = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1753 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1754 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1755 - .plaintext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1756 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1757 "\xf3\x44\x81\xec\x3c\xc6\x27\xba\xcd\x5d\xc3\xfb\x08\xf2\x73\xe6", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1758 - .ciphertext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1759 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1760 "\x03\x36\x76\x3e\x96\x6d\x92\x59\x5a\x56\x7c\xc9\xce\x53\x7f\x5e", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1761 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1762 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1763 - .key = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1764 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1765 "\x10\xa5\x88\x69\xd7\x4b\xe5\xa3\x74\xcf\x86\x7c\xfb\x47\x38\x59", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1766 - .plaintext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1767 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1768 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1769 - .ciphertext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1770 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1771 "\x6d\x25\x1e\x69\x44\xb0\x51\xe0\x4e\xaa\x6f\xb4\xdb\xf7\x84\x65", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1772 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1773 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1774 - .key = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1775 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1776 "\xca\xea\x65\xcd\xbb\x75\xe9\x16\x9e\xcd\x22\xeb\xe6\xe5\x46\x75", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1777 - .plaintext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1778 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1779 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1780 - .ciphertext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1781 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1782 "\x6e\x29\x20\x11\x90\x15\x2d\xf4\xee\x05\x81\x39\xde\xf6\x10\xbb", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1783 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1784 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1785 - .key = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1786 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1787 "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1788 - .plaintext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1789 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1790 "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1791 - .ciphertext = (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1792 + (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1793 "\x9b\xa4\xa9\x14\x3f\x4e\x5d\x40\x48\x52\x1c\x4f\x88\x77\xd8\x8e", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1794 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1795 }; |
3288
55c51f5ec98d
* src/msvc-gnutls-1.patch: Update to gnutls 3.2.3.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3080
diff
changeset
|
1796 @@ -352,128 +355,121 @@ |
3080
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1797 } hash_vectors[] = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1798 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1799 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1800 - .name = "SHA1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1801 - .algorithm = GNUTLS_MAC_SHA1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1802 - .key = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1803 - .plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1804 + "SHA1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1805 + GNUTLS_MAC_SHA1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1806 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1807 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1808 (uint8_t *) "what do ya want for nothing?", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1809 - .plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1810 sizeof ("what do ya want for nothing?") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1811 - .output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1812 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1813 "\x8f\x82\x03\x94\xf9\x53\x35\x18\x20\x45\xda\x24\xf3\x4d\xe5\x2b\xf8\xbc\x34\x32", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1814 - .output_size = 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1815 + 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1816 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1817 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1818 - .name = "SHA1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1819 - .algorithm = GNUTLS_MAC_SHA1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1820 - .key = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1821 - .plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1822 + "SHA1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1823 + GNUTLS_MAC_SHA1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1824 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1825 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1826 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1827 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1828 - .plaintext_size = sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1829 + sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1830 ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1831 - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1832 - .output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1833 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1834 "\xbe\xae\xd1\x6d\x65\x8e\xc7\x92\x9e\xdf\xd6\x2b\xfa\xfe\xac\x29\x9f\x0d\x74\x4d", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1835 - .output_size = 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1836 + 20, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1837 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1838 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1839 - .name = "SHA256", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1840 - .algorithm = GNUTLS_MAC_SHA256, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1841 - .key = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1842 - .plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1843 + "SHA256", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1844 + GNUTLS_MAC_SHA256, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1845 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1846 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1847 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1848 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1849 - .plaintext_size = sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1850 + sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1851 ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1852 - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1853 - .output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1854 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1855 "\x24\x8d\x6a\x61\xd2\x06\x38\xb8\xe5\xc0\x26\x93\x0c\x3e\x60\x39\xa3\x3c\xe4\x59\x64\xff\x21\x67\xf6\xec\xed\xd4\x19\xdb\x06\xc1", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1856 - .output_size = 32, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1857 + 32, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1858 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1859 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1860 - .name = "SHA256", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1861 - .algorithm = GNUTLS_MAC_SHA256, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1862 - .key = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1863 - .plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1864 + "SHA256", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1865 + GNUTLS_MAC_SHA256, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1866 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1867 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1868 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1869 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1870 - .plaintext_size = sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1871 + sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1872 ("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1873 - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1874 - .output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1875 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1876 "\x50\xea\x82\x5d\x96\x84\xf4\x22\x9c\xa2\x9f\x1f\xec\x51\x15\x93\xe2\x81\xe4\x6a\x14\x0d\x81\xe0\x00\x5f\x8f\x68\x86\x69\xa0\x6c", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1877 - .output_size = 32, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1878 + 32, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1879 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1880 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1881 - .name = "SHA512", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1882 - .algorithm = GNUTLS_MAC_SHA512, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1883 - .key = NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1884 - .plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1885 + "SHA512", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1886 + GNUTLS_MAC_SHA512, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1887 + NULL, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1888 + 0, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1889 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1890 "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1891 - .plaintext_size = sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1892 + sizeof |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1893 ("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu") |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1894 - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1895 - .output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1896 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1897 "\x8e\x95\x9b\x75\xda\xe3\x13\xda\x8c\xf4\xf7\x28\x14\xfc\x14\x3f\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1\x72\x99\xae\xad\xb6\x88\x90\x18\x50\x1d\x28\x9e\x49\x00\xf7\xe4\x33\x1b\x99\xde\xc4\xb5\x43\x3a\xc7\xd3\x29\xee\xb6\xdd\x26\x54\x5e\x96\xe5\x5b\x87\x4b\xe9\x09", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1898 - .output_size = 64, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1899 + 64, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1900 }, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1901 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1902 - .name = "HMAC-MD5",.algorithm = GNUTLS_MAC_MD5,.key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1903 - (uint8_t *) "Jefe",.key_size = 4,.plaintext = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1904 - (uint8_t *) "what do ya want for nothing?",. |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1905 - plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1906 - sizeof ("what do ya want for nothing?") - 1,.output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1907 + "HMAC-MD5",GNUTLS_MAC_MD5, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1908 + (uint8_t *) "Jefe",4, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1909 + (uint8_t *) "what do ya want for nothing?", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1910 + sizeof ("what do ya want for nothing?") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1911 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1912 - "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38",.output_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1913 - = 16,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1914 + "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1915 + 16,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1916 , |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1917 /* from rfc4231 */ |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1918 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1919 - .name = "HMAC-SHA2-224",.algorithm = GNUTLS_MAC_SHA224,.key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1920 + "HMAC-SHA2-224",GNUTLS_MAC_SHA224, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1921 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1922 - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",.key_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1923 - = 20,.plaintext = (uint8_t *) "Hi There",.plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1924 - sizeof ("Hi There") - 1,.output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1925 + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1926 + 20,(uint8_t *) "Hi There", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1927 + sizeof ("Hi There") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1928 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1929 - "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22",.output_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1930 - = 28,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1931 + "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19\x68\x32\x10\x7c\xd4\x9d\xf3\x3f\x47\xb4\xb1\x16\x99\x12\xba\x4f\x53\x68\x4b\x22", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1932 + 28,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1933 , |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1934 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1935 - .name = "HMAC-SHA2-256",.algorithm = GNUTLS_MAC_SHA256,.key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1936 + "HMAC-SHA2-256",GNUTLS_MAC_SHA256, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1937 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1938 - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",.key_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1939 - = 20,.plaintext = (uint8_t *) "Hi There",.plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1940 - sizeof ("Hi There") - 1,.output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1941 + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1942 + 20,(uint8_t *) "Hi There", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1943 + sizeof ("Hi There") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1944 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1945 - "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7",.output_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1946 - = 32,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1947 + "\xb0\x34\x4c\x61\xd8\xdb\x38\x53\x5c\xa8\xaf\xce\xaf\x0b\xf1\x2b\x88\x1d\xc2\x00\xc9\x83\x3d\xa7\x26\xe9\x37\x6c\x2e\x32\xcf\xf7", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1948 + 32,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1949 , |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1950 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1951 - .name = "HMAC-SHA2-384",.algorithm = GNUTLS_MAC_SHA384,.key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1952 + "HMAC-SHA2-384",GNUTLS_MAC_SHA384, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1953 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1954 - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",.key_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1955 - = 20,.plaintext = (uint8_t *) "Hi There",.plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1956 - sizeof ("Hi There") - 1,.output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1957 + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1958 + 20,(uint8_t *) "Hi There", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1959 + sizeof ("Hi There") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1960 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1961 - "\xaf\xd0\x39\x44\xd8\x48\x95\x62\x6b\x08\x25\xf4\xab\x46\x90\x7f\x15\xf9\xda\xdb\xe4\x10\x1e\xc6\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c\xfa\xea\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6",.output_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1962 - = 48,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1963 + "\xaf\xd0\x39\x44\xd8\x48\x95\x62\x6b\x08\x25\xf4\xab\x46\x90\x7f\x15\xf9\xda\xdb\xe4\x10\x1e\xc6\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c\xfa\xea\x9e\xa9\x07\x6e\xde\x7f\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1964 + 48,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1965 , |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1966 { |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1967 - .name = "HMAC-SHA2-512",.algorithm = GNUTLS_MAC_SHA512,.key = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1968 + "HMAC-SHA2-512",GNUTLS_MAC_SHA512, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1969 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1970 - "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",.key_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1971 - = 20,.plaintext = (uint8_t *) "Hi There",.plaintext_size = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1972 - sizeof ("Hi There") - 1,.output = |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1973 + "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1974 + 20,(uint8_t *) "Hi There", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1975 + sizeof ("Hi There") - 1, |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1976 (uint8_t *) |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1977 - "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54",.output_size |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1978 - = 64,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1979 + "\x87\xaa\x7c\xde\xa5\xef\x61\x9d\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0\x23\x79\xf4\xe2\xce\x4e\xc2\x78\x7a\xd0\xb3\x05\x45\xe1\x7c\xde\xda\xa8\x33\xb7\xd6\xb8\xa7\x02\x03\x8b\x27\x4e\xae\xa3\xf4\xe4\xbe\x9d\x91\x4e\xeb\x61\xf1\x70\x2e\x69\x6c\x20\x3a\x12\x68\x54", |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1980 + 64,} |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1981 ,}; |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1982 |
c0222ce8760d
[MSVC] enable MSVC compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1983 #define HASH_DATA_SIZE 64 |