diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-09-11 04:15:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-09-11 04:15:03 +0000 |
commit | 28ce309504d1432e9fead5af54c27e20f41da59c (patch) | |
tree | 9bff68f331e71361f2dd04c88e7a1a03c8dad604 | |
parent | 44a26637136f638fa53b62ae0138605c878d29d8 (diff) | |
download | libmicrohttpd-28ce309504d1432e9fead5af54c27e20f41da59c.tar.gz libmicrohttpd-28ce309504d1432e9fead5af54c27e20f41da59c.zip |
make dist fixes
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | src/daemon/https/Makefile.am | 1 | ||||
-rw-r--r-- | src/daemon/https/tls/Makefile.am | 44 | ||||
-rw-r--r-- | src/daemon/https/tls/ext_server_name.c | 3 | ||||
-rw-r--r-- | src/daemon/https/x509/Makefile.am | 29 |
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 | ||
4 | DISTCLEANFILES = microhttpd.cps tutorial.cps | 4 | DISTCLEANFILES = microhttpd.cps tutorial.cps |
5 | info_TEXINFOS = microhttpd.texi tutorial.texi | 5 | info_TEXINFOS = microhttpd.texi tutorial.texi |
6 | microhttpd_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 | 6 | microhttpd_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 @@ | |||
1 | EXTRA_DIST = gnutls.h | ||
1 | SUBDIRS = minitasn1 lgl x509 tls . | 2 | SUBDIRS = 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 \ | |||
65 | gnutls_ui.c \ | 65 | gnutls_ui.c \ |
66 | gnutls_x509.c \ | 66 | gnutls_x509.c \ |
67 | pkix_asn1_tab.c \ | 67 | pkix_asn1_tab.c \ |
68 | x509_b64.c \ No newline at end of file | 68 | x509_b64.c \ |
69 | auth_anon.h \ | ||
70 | auth_cert.h \ | ||
71 | auth_dh_common.h \ | ||
72 | debug.h \ | ||
73 | defines.h \ | ||
74 | ext_cert_type.h \ | ||
75 | ext_max_record.h \ | ||
76 | ext_oprfi.h \ | ||
77 | ext_server_name.h \ | ||
78 | gnutls_algorithms.h \ | ||
79 | gnutls_auth.h \ | ||
80 | gnutls_auth_int.h \ | ||
81 | gnutls_buffers.h \ | ||
82 | gnutls_cert.h \ | ||
83 | gnutls_cipher.h \ | ||
84 | gnutls_cipher_int.h \ | ||
85 | gnutls_compress.h \ | ||
86 | gnutls_compress_int.h \ | ||
87 | gnutls_constate.h \ | ||
88 | gnutls_datum.h \ | ||
89 | gnutls_dh.h \ | ||
90 | gnutls_errors.h \ | ||
91 | gnutls_extensions.h \ | ||
92 | gnutls_global.h \ | ||
93 | gnutls_handshake.h \ | ||
94 | gnutls_hash_int.h \ | ||
95 | gnutls_int.h \ | ||
96 | gnutls_kx.h \ | ||
97 | gnutls_mem.h \ | ||
98 | gnutls_mpi.h \ | ||
99 | gnutls_num.h \ | ||
100 | gnutls_pk.h \ | ||
101 | gnutls_record.h \ | ||
102 | gnutls_rsa_export.h \ | ||
103 | gnutls_session_pack.h \ | ||
104 | gnutls_sig.h \ | ||
105 | gnutls_state.h \ | ||
106 | gnutls_str.h \ | ||
107 | gnutls_supplemental.h \ | ||
108 | gnutls_x509.h \ | ||
109 | io_debug.h \ | ||
110 | x509_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 | ||
15 | libx509_la_SOURCES = \ | 15 | libx509_la_SOURCES = \ |
16 | common.c \ | 16 | common.c common.h \ |
17 | crq.c \ | 17 | crq.c crq.h \ |
18 | crl.c \ | 18 | crl.c \ |
19 | dn.c \ | 19 | dn.c dn.h \ |
20 | dsa.c \ | 20 | dsa.c dsa.h \ |
21 | extensions.c \ | 21 | extensions.c extensions.h \ |
22 | mpi.c \ | 22 | mpi.c mpi.h \ |
23 | pkcs12_bag.c \ | 23 | pkcs12_bag.c \ |
24 | pkcs12.c \ | 24 | pkcs12.c pkcs12.h \ |
25 | pkcs12_encr.c \ | 25 | pkcs12_encr.c \ |
26 | pkcs7.c \ | 26 | pkcs7.c pkcs7.h \ |
27 | x509_privkey.c \ | 27 | x509_privkey.c privkey.h \ |
28 | privkey_pkcs8.c \ | 28 | privkey_pkcs8.c \ |
29 | rfc2818_hostname.c \ | 29 | rfc2818_hostname.c rfc2818.h \ |
30 | sign.c \ | 30 | sign.c sign.h \ |
31 | x509_verify.c \ | 31 | x509_verify.c verify.h \ |
32 | x509.c | 32 | x509.c x509.h |
33 | |||
34 | |||
35 | |||