aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-09-11 04:15:03 +0000
committerChristian Grothoff <christian@grothoff.org>2008-09-11 04:15:03 +0000
commit28ce309504d1432e9fead5af54c27e20f41da59c (patch)
tree9bff68f331e71361f2dd04c88e7a1a03c8dad604
parent44a26637136f638fa53b62ae0138605c878d29d8 (diff)
downloadlibmicrohttpd-28ce309504d1432e9fead5af54c27e20f41da59c.tar.gz
libmicrohttpd-28ce309504d1432e9fead5af54c27e20f41da59c.zip
make dist fixes
-rw-r--r--doc/Makefile.am2
-rw-r--r--src/daemon/https/Makefile.am1
-rw-r--r--src/daemon/https/tls/Makefile.am44
-rw-r--r--src/daemon/https/tls/ext_server_name.c3
-rw-r--r--src/daemon/https/x509/Makefile.am29
5 files changed, 59 insertions, 20 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dcb18539..11a0810b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,5 +3,5 @@ EXTRA_DIST = $(man_MANS) Doxyfile
3 3
4DISTCLEANFILES = microhttpd.cps tutorial.cps 4DISTCLEANFILES = microhttpd.cps tutorial.cps
5info_TEXINFOS = microhttpd.texi tutorial.texi 5info_TEXINFOS = microhttpd.texi tutorial.texi
6microhttpd_TEXINFOS = lgpl.texi chapters/basicauthentication.inc chapters/bibliography.inc chapters/exploringrequests.inc fdl-1.2.texi chapters/hellobrowser.inc chapters/introduction.inc chapters/processingpost.inc chapters/responseheaders.inc 6microhttpd_TEXINFOS = lgpl.texi chapters/basicauthentication.inc chapters/bibliography.inc chapters/exploringrequests.inc fdl-1.2.texi chapters/hellobrowser.inc chapters/introduction.inc chapters/processingpost.inc chapters/responseheaders.inc chapters/largerpost.inc
7 7
diff --git a/src/daemon/https/Makefile.am b/src/daemon/https/Makefile.am
index df07d8a9..e022e45b 100644
--- a/src/daemon/https/Makefile.am
+++ b/src/daemon/https/Makefile.am
@@ -1 +1,2 @@
1EXTRA_DIST = gnutls.h
1SUBDIRS = minitasn1 lgl x509 tls . 2SUBDIRS = minitasn1 lgl x509 tls .
diff --git a/src/daemon/https/tls/Makefile.am b/src/daemon/https/tls/Makefile.am
index b2e4f6f5..aa8a71a7 100644
--- a/src/daemon/https/tls/Makefile.am
+++ b/src/daemon/https/tls/Makefile.am
@@ -65,4 +65,46 @@ gnutls_supplemental.c \
65gnutls_ui.c \ 65gnutls_ui.c \
66gnutls_x509.c \ 66gnutls_x509.c \
67pkix_asn1_tab.c \ 67pkix_asn1_tab.c \
68x509_b64.c \ No newline at end of file 68x509_b64.c \
69auth_anon.h \
70auth_cert.h \
71auth_dh_common.h \
72debug.h \
73defines.h \
74ext_cert_type.h \
75ext_max_record.h \
76ext_oprfi.h \
77ext_server_name.h \
78gnutls_algorithms.h \
79gnutls_auth.h \
80gnutls_auth_int.h \
81gnutls_buffers.h \
82gnutls_cert.h \
83gnutls_cipher.h \
84gnutls_cipher_int.h \
85gnutls_compress.h \
86gnutls_compress_int.h \
87gnutls_constate.h \
88gnutls_datum.h \
89gnutls_dh.h \
90gnutls_errors.h \
91gnutls_extensions.h \
92gnutls_global.h \
93gnutls_handshake.h \
94gnutls_hash_int.h \
95gnutls_int.h \
96gnutls_kx.h \
97gnutls_mem.h \
98gnutls_mpi.h \
99gnutls_num.h \
100gnutls_pk.h \
101gnutls_record.h \
102gnutls_rsa_export.h \
103gnutls_session_pack.h \
104gnutls_sig.h \
105gnutls_state.h \
106gnutls_str.h \
107gnutls_supplemental.h \
108gnutls_x509.h \
109io_debug.h \
110x509_b64.h
diff --git a/src/daemon/https/tls/ext_server_name.c b/src/daemon/https/tls/ext_server_name.c
index c4aabf56..64ef0b06 100644
--- a/src/daemon/https/tls/ext_server_name.c
+++ b/src/daemon/https/tls/ext_server_name.c
@@ -128,13 +128,12 @@ mhd_gtls_server_name_send_params (mhd_gtls_session_t session,
128 opaque * data, size_t _data_size) 128 opaque * data, size_t _data_size)
129{ 129{
130 int total_size = 0; 130 int total_size = 0;
131 131#if MHD_DEBUG_TLS
132 uint16_t len; 132 uint16_t len;
133 opaque *p; 133 opaque *p;
134 unsigned i; 134 unsigned i;
135 ssize_t data_size = _data_size; 135 ssize_t data_size = _data_size;
136 136
137#if MHD_DEBUG_TLS
138 /* this function sends the client extension data (dnsname) */ 137 /* this function sends the client extension data (dnsname) */
139 if (session->security_parameters.entity == GNUTLS_CLIENT) 138 if (session->security_parameters.entity == GNUTLS_CLIENT)
140 { 139 {
diff --git a/src/daemon/https/x509/Makefile.am b/src/daemon/https/x509/Makefile.am
index f0d05c27..04c715a2 100644
--- a/src/daemon/https/x509/Makefile.am
+++ b/src/daemon/https/x509/Makefile.am
@@ -13,23 +13,20 @@ libx509_la_LDFLAGS = -lgcrypt
13# -l $(top_srcdir)/src/daemon/https/lgl/liblgl.la 13# -l $(top_srcdir)/src/daemon/https/lgl/liblgl.la
14 14
15libx509_la_SOURCES = \ 15libx509_la_SOURCES = \
16common.c \ 16common.c common.h \
17crq.c \ 17crq.c crq.h \
18crl.c \ 18crl.c \
19dn.c \ 19dn.c dn.h \
20dsa.c \ 20dsa.c dsa.h \
21extensions.c \ 21extensions.c extensions.h \
22mpi.c \ 22mpi.c mpi.h \
23pkcs12_bag.c \ 23pkcs12_bag.c \
24pkcs12.c \ 24pkcs12.c pkcs12.h \
25pkcs12_encr.c \ 25pkcs12_encr.c \
26pkcs7.c \ 26pkcs7.c pkcs7.h \
27x509_privkey.c \ 27x509_privkey.c privkey.h \
28privkey_pkcs8.c \ 28privkey_pkcs8.c \
29rfc2818_hostname.c \ 29rfc2818_hostname.c rfc2818.h \
30sign.c \ 30sign.c sign.h \
31x509_verify.c \ 31x509_verify.c verify.h \
32x509.c 32x509.c x509.h
33
34
35