Merge branch 'master' into ECC-INTEGRATION-2-1
authorWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:24:11 +0000 (12:24 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 24 Jan 2011 11:24:11 +0000 (12:24 +0100)
1  2 
ChangeLog
agent/ChangeLog
common/ChangeLog
common/util.h
configure.ac
dirmngr/Makefile.am
g10/ChangeLog
g10/Makefile.am
g10/export.c
g10/gpg.c
g10/main.h

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,13 +1,18 @@@
+ 2011-01-20  Werner Koch  <wk@g10code.com>
+       * configure.ac (AC_CONFIG_FILES): Remove keyserver/.
+ 2011-01-19  Werner Koch  <wk@g10code.com>
+       * configure.ac: Add new option --enable-gpg2-is-gpg.
+       (NAME_OF_INSTALLED_GPG): New ac_define.
+       * autogen.sh [--build-w32ce]: Use --enable-gpg2-is-gpg.
 +2011-01-21  Werner Koch  <wk@g10code.com>
 +
 +      * configure.ac: Need Libgcrypt 1.4.6 due to AESWRAP.
 +      (HAVE_GCRY_PK_ECDH): Add new test.
 +
  2011-01-03  Werner Koch  <wk@g10code.com>
  
        * README.SVN:  Rename to README.GIT.
diff --cc agent/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
+ 2011-01-19  Werner Koch  <wk@g10code.com>
+       * trustlist.c (read_one_trustfile): Also chop an CR.
 +2011-01-21  Werner Koch  <wk@g10code.com>
 +
 +      * pksign.c (do_encode_dsa): Compare MDLEN to bytes.
 +
 +      * cvt-openpgp.c (GCRY_PK_ECDH) [!HAVE_GCRY_PK_ECDH]: New.
 +
  2010-12-02  Werner Koch  <wk@g10code.com>
  
        * gpg-agent.c (CHECK_OWN_SOCKET_INTERVAL) [W32CE]: Set to 60
@@@ -1,8 -1,55 +1,60 @@@
+ 2011-01-20  Werner Koch  <wk@g10code.com>
+       Fix bug#1313.
+       * http.c (my_select): New.  Define to pth_select if building with Pth.
+       (start_server, write_server, cookie_read, cookie_write): Use it.
+       (my_connect): New.  Define to pth_connect if building with Pth.
+       (connect_server): Use it.
+       (my_accept): New.  Define to pth_accept if building with Pth.
+       (start_server): Use it.
+ 2011-01-20  Werner Koch  <wk@g10code.com>
+       * util.h (struct b64state): Add field LASTERR.
+       * b64enc.c (enc_start, b64enc_write, b64enc_finish): Handle
+       LASTERR.  This is to make sure that we don't leak strduped data.
+       * b64dec.c (b64dec_start, b64dec_proc, b64dec_finish): Ditto.
+       * http.c (escape_data): New.
+       (insert_escapes): Implement using escape_data.
+       (http_escape_data): New.
+ 2011-01-19  Werner Koch  <wk@g10code.com>
+       * homedir.c (gnupg_module_name): Use NAME_OF_INSTALLED_GPG instead
+       of "gpg2".
+ 2011-01-18  Werner Koch  <wk@g10code.com>
+       * iobuf.c (file_es_filter_ctx_t): New.
+       (file_es_filter): New.
+       (iobuf_esopen): New.
+       * membuf.c (clear_membuf, peek_membuf): New.
+       * util.h (GPG_ERR_NO_KEYSERVER): New.
+       * keyserver.h (keyserver_spec): Move from ../g10/options.h to here.
+       * http.c (do_parse_uri): Add arg NO_SCHEME_CHECK.  Change all
+       callers.  Support HKP and HKPS.
+       (_http_parse_uri): Do proper error management.
+       * http.h (parsed_uri_s): Add field IS_HTTP.
+       (http_parse_uri): Support NO_SCHEME_CHECK arg.
+       * estream.c (es_func_mem_write): Fix computation of NEWSIZE.
+ 2011-01-10  Werner Koch  <wk@g10code.com>
+       * session-env.c (update_var): Fix same value detection.  Fixes
+       bug#1311.
 +2011-01-10  Werner Koch  <wk@g10code.com>
 +
 +      * session-env.c (update_var): Fix same value detection.  Fixes
 +      bug#1311.
 +
  2010-12-17  Werner Koch  <wk@g10code.com>
  
        * asshelp.c (lock_spawning): Add arg VERBOSE.  Improve timeout
diff --cc common/util.h
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc g10/ChangeLog
@@@ -1,9 -1,25 +1,31 @@@
+ 2011-01-20  Werner Koch  <wk@g10code.com>
+       * keyserver.c: Rewrite most stuff for use with dirmngr.  Get rid
+       of all spawn code.  Work work pending.
+       * export.c (export_pubkeys_buffer): New.
+       * import.c (import_keys_es_stream): New.
+       * call-dirmngr.c, call-dirmngr.h: New.
+       * gpg.h (server_control_s): Add DIRMNGR_LOCAL.
+       * gpg.c: Include call-dirmngr.h.
+       (gpg_deinit_default_ctrl): Call gpg_dirmngr_deinit_session_data.
+ 2011-01-06  Werner Koch  <wk@g10code.com>
+       * gpg.c (main): Use keyserver_spec_t.
+       * options.h (struct opt): Factor definition of struct keyserver
+       out to ../common/keyserver.h.
+       (keyserver_spec_t): New.
 +2011-01-21  Werner Koch  <wk@g10code.com>
 +
 +      * seskey.c (encode_md_value): Truncate the DSA hash again.
 +
 +      * misc.c (openpgp_pk_algo_name): Always use the gcrypt function.
 +
  2010-12-09  Werner Koch  <wk@g10code.com>
  
        * tdbio.c (tdbio_set_dbname) [W32CE]: Take care of missing errno.
diff --cc g10/Makefile.am
Simple merge
diff --cc g10/export.c
Simple merge
diff --cc g10/gpg.c
Simple merge
diff --cc g10/main.h
Simple merge