1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-10-31 20:08:43 +01:00
Commit Graph

9192 Commits

Author SHA1 Message Date
David Shaw
8220c9e799 * gpgkeys_curl.c (main): Only allow specified protocols to use the
curl handler.

* Makefile.am: Use LIBCURL_CPPFLAGS instead of LIBCURL_INCLUDES.
2005-01-18 04:24:52 +00:00
David Shaw
586be6711e * libcurl.m4: Use LIBCURL_CPPFLAGS and not LIBCURL_INCLUDES to match
automake syntax.
2005-01-18 03:54:46 +00:00
Werner Koch
cc19a07082 Same for
--without-included-regex.
2005-01-17 10:19:57 +00:00
Werner Koch
4440af47f7 Make --without-included-zlib work as
expected. Reported by Norihiko Murase.
2005-01-17 10:13:59 +00:00
Werner Koch
3a71b7f87f Make --without-included-zlib work as
expected. Reported by Norihiko Murase.
2005-01-17 10:13:59 +00:00
David Shaw
996c82ffd6 * ksutil.h, gpgkeys_curl.c, gpgkeys_hkp.c, gpgkeys_ldap.c,
gpgkeys_finger.c, gpgkeys_http.c: Part 2 of the cleanup.  Move all the
various defines to ksutil.h.
2005-01-13 23:37:26 +00:00
David Shaw
0a42f97e43 * gpgkeys_finger.c, gpgkeys_hkp.c, gpgkeys_http.c, gpgkeys_ldap.c: Part 1
of a minor cleanup to use #defines instead of hard-coded sizes.
2005-01-13 23:22:10 +00:00
David Shaw
522fd5bc82 * http.c (connect_server): Use INADDR_NONE instead of SOCKET_ERROR.
Noted by Timo.
2005-01-13 22:09:33 +00:00
David Shaw
3fe489d1ac * gpgkeys_finger.c (connect_server): Use INADDR_NONE instead of
SOCKET_ERROR.  Noted by Timo.
2005-01-13 22:08:18 +00:00
Werner Koch
6cb495ca5c post release updates 2005-01-13 19:03:37 +00:00
Werner Koch
444c93043d * acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Link a simple test
program to see whether the installation is sane.

* certreqgen.c (proc_parameters): Cast printf arg.
2005-01-13 18:00:46 +00:00
Werner Koch
d8ec7c96aa * w32installer.nsi: New.
* mk-w32-dist: Append ".txt" to some files.  Call makensis if
available.
2005-01-11 12:03:22 +00:00
David Shaw
96a3982b9b * keyedit.c (keyedit_menu): Move command strings outside the function to
get ready for the readline completion code.
2005-01-11 04:15:55 +00:00
David Shaw
74ca58ee94 * passphrase.c (readline, agent_send_option, agent_open,
agent_get_passphrase, passphrase_clear_cache): Rename readline() to
readaline() to keep readline library namespace clear.
2005-01-10 22:56:46 +00:00
David Shaw
1f91ed775c * gpgkeys_curl.c (get_key): Newer versions of libcurl don't define TRUE. 2005-01-10 03:46:12 +00:00
David Shaw
f464dcef59 * filter.h, armor.c (armor_filter): Use the eol string from the armor
filter context instead of hardcoding '\n' or '\r\n'.  If no eol string is
provided, default to '\n' or '\r\n' as appropriate. (is_armor_header):
Trim tabs in armor header lines as well.

* keyserver.c (keyserver_spawn): Use it here to force '\n' line endings
since the keyserver output file gets a LF->CRLF expansion on win32.
2005-01-06 16:23:47 +00:00
Werner Koch
9dc1bcc4ea (set_native_charset): Assume that ASCII,
ANSI_X3.4-1968 and 646 are actually meant as Latin-1.  If
nl_langinfo is not available get the charset from environment
variables. For W32 use GetACP as error fallback.  Removed Latin-15
to Latin-1 aliasing.
2005-01-06 11:51:49 +00:00
David Shaw
299a250c94 * g10.c (main): Typo.
* armor.c (is_armor_header): Allow CR and LF (not just actual spaces) in
an armor header line (-----BEGIN etc).  This is needed due to CRLF issues
on win32.  As before, --openpgp makes it strict.
2005-01-06 04:44:38 +00:00
Werner Koch
902a775ada Updated. 2005-01-04 15:57:10 +00:00
Werner Koch
2f0c8ff6fb (agent_put_cache): Fix the test for using the default
TTL.
2005-01-04 08:33:20 +00:00
David Shaw
61197deca8 * configure.ac: Use new GNUPG_CHECK_LIBUSB macro. 2005-01-03 15:18:24 +00:00
David Shaw
8d3e8193bd * Makefile.am, libusb.m4: New libusb check macro. 2005-01-03 15:16:57 +00:00
David Shaw
14ce45565d * Makefile.am: Use @LIBUSB@ instead of @LIBUSB_LIBS@
* import.c (delete_inv_parts): Comments on import-unusable-sigs.
2005-01-03 15:15:34 +00:00
Werner Koch
832edf9963 (send_pinentry_environment): Fixed changed from
2004-12-18; cut+paste error for lc-messages.
2005-01-03 11:30:43 +00:00
David Shaw
fbee22ac0c * options.h, import.c (parse_import_options, delete_inv_parts): Add
import-unusable-sigs flag to enable importing unusable (currently:
expired) sigs.

* options.h, export.c (parse_export_options, do_export_stream): Add
export-unusable-sigs flag to enable exporting unusable (currently:
expired) sigs.
2005-01-01 21:21:11 +00:00
David Shaw
2193ab9fc7 * configure.ac: Better implementation for the SRV check. We don't need to
actually check all the header files individually since the SRV test
compile uses them together.
2004-12-30 03:31:19 +00:00
David Shaw
b37facc593 * packet.h, getkey.c (merge_selfsigs_main, sig_to_revoke_info), keyid.c
(revokestr_from_pk), keyedit.c (show_key_with_all_names): Show who revoked
a key (either the same key or a designated revoker) and when.
2004-12-30 03:26:57 +00:00
David Shaw
f539f3d2b2 Better implementation for the SRV check. We don't need to actually check
all the header files individually since the SRV test compile uses them
together.
2004-12-29 00:58:05 +00:00
Werner Koch
afe8ca4fbf (find_endpoint): New.
(scan_or_find_devices): Add new args to return endpoint info and
interface number.
(ccid_open_reader, ccid_shutdown_reader): Take care of these new
args.
(bulk_in, bulk_out): Use the correct endpoints.
(ccid_transceive_apdu_level): New.
(ccid_transceive): Divert to above.
(parse_ccid_descriptor): Allow APDU level exchange mode.
(do_close_reader): Pass the interface number to usb_release_interface.
2004-12-28 07:30:57 +00:00
Werner Koch
6a899889bc (find_endpoint): New.
(scan_or_find_devices): Add new args to return endpoint info and
interface number.
(ccid_open_reader, ccid_shutdown_reader): Take care of these new
args.
(bulk_in, bulk_out): Use the correct endpoints.
(ccid_transceive_apdu_level): New.
(ccid_transceive): Divert to above.
(parse_ccid_descriptor): Allow APDU level exchange mode.
2004-12-28 07:13:24 +00:00
David Shaw
783ec6dbb2 * keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has
specifically been selected to handle them.
2004-12-24 19:51:02 +00:00
David Shaw
d341143cd7 * gpgkeys_curl.c (main): Use new defines for opting out of certain
transfer protocols.  Allow setting HTTP proxy via "http-proxy=foo" option
(there is natural support in libcurl for the http_proxy environment
variable).

* Makefile.am: Remove the conditional since this is all handled in
autoconf now.
2004-12-24 19:48:36 +00:00
David Shaw
f5b59b119f * configure.ac: Use new LIBCURL_CHECK_CONFIG macro for all libcurl stuff.
This simplifies, and we don't need the automake conditional stuff any
longer.
2004-12-24 19:43:16 +00:00
David Shaw
957ed452ac * libcurl.m4: Rewrite this to use the new --protocols flag I gave to the
libcurl people.

* Makefile.am: Add readline.m4 and libcurl.m4.
2004-12-24 19:41:06 +00:00
David Shaw
9756b0fc68 * libcurl.m4: OSX has a problem with their curl-config script. 2004-12-23 16:34:08 +00:00
David Shaw
7c67985457 * readline.m4: Make sure that readline is modern enough to understand
rl_catch_signals.

* libcurl.m4: Don't require curl-config to be present since it seems some
binary packages don't include it.  Allow users to specify LIBCURL and
LIBCURL_INCLUDES for us.
2004-12-23 16:12:13 +00:00
David Shaw
97b8f41b08 * gpgkeys_curl.c (main): New "follow-redirects" option. Takes an optional
numeric value for the maximum number of redirects to allow.  Defaults to
5.

* gpgkeys_curl.c (main), gpgkeys_finger.c (main), gpgkeys_hkp.c (main),
gpgkeys_http.c (main), gpgkeys_ldap.c (main): Make sure that a "timeout"
option passed with no arguments is properly handled.
2004-12-22 19:19:10 +00:00
Werner Koch
b85cf46a42 Post release updates 2004-12-22 19:07:46 +00:00
Werner Koch
543a671a6d Minor tweaks 2004-12-22 18:22:49 +00:00
David Shaw
f3c33b8768 * options.h, keyserver.c (parse_keyserver_uri): Properly parse auth data
from URLs and pass to keyserver helpers.
2004-12-22 18:09:41 +00:00
David Shaw
0361c6f01b * gpgkeys_curl.c (get_key, writer): New function to wrap around fwrite to
avoid DLL access problem on win32.

* gpgkeys_http.c (main, get_key): Properly pass authentication info
through to the http library.
2004-12-22 18:07:21 +00:00
Werner Koch
1f11db5829 Preapring a release 2004-12-22 18:05:14 +00:00
Werner Koch
de6f6d2015 (set_binary): New.
(main, open_read, open_fwrite): Use it.
2004-12-22 17:55:28 +00:00
David Shaw
b96038387b * keyserver.c (keyserver_typemap): New. Map certain keyserver types to a
common type (e.g. ldaps -> ldap).  If we are building with curl, map both
http and ftp to curl.

* build-packet.c (build_sig_subpkt): Only allow one preferred keyserver
subpacket at a time.
2004-12-22 17:49:44 +00:00
Werner Koch
c9489fc76e * gnupg.texi: Reordered.
* contrib.texi: Updated.
2004-12-22 17:24:13 +00:00
David Shaw
52595e06f6 * Makefile.am: Build gpgkeys_http or gpgkeys_curl as needed.
* gpgkeys_curl.c (main, get_key): Minor tweaks to work with either FTP or
HTTP.

* gpgkeys_ftp.c: renamed to gpgkeys_curl.c.
2004-12-22 17:12:23 +00:00
David Shaw
034b095f31 * configure.ac: --enable-ftp is on by default, --with-libcurl is off by
default.  If we have neither of --enable-ftp or --enable-http, don't even
check for curl.
2004-12-22 17:07:39 +00:00
David Shaw
e3821bfc2a * libcurl.m4: Be much more strict with libcurl by trying to compile and
link a test program that uses the features that we need.
2004-12-22 17:03:27 +00:00
David Shaw
f150d44a31 * gpgkeys_ftp.c (main, get_key): Use auth data as passed by gpg. Use
CURLOPT_FILE instead of CURLOPT_WRITEDATA (same option, but backwards
compatible).
2004-12-22 05:23:22 +00:00
David Shaw
ab4b98c77a * autogen.sh: automake needs --add-missing for conditional CPPFLAGS build
in keyserver/Makefile.am.
2004-12-21 23:44:06 +00:00