Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Sun, 13 May 2018 11:29:40 +0000 (13:29 +0200)
committerWerner Koch <wk@gnupg.org>
Sun, 13 May 2018 11:29:40 +0000 (13:29 +0200)
--

Resolved Conflicts:
NEWS  - removed
configure.ac - removed

Signed-off-by: Werner Koch <wk@gnupg.org>
22 files changed:
1  2 
agent/command.c
common/exechelp-w32.c
common/miscellaneous.c
configure.ac
dirmngr/crlcache.c
dirmngr/dirmngr.c
dirmngr/http.c
doc/DETAILS
doc/Makefile.am
doc/gpg.texi
g10/card-util.c
g10/filter.h
g10/getkey.c
g10/gpg.c
g10/import.c
g10/keydb.h
g10/keyedit.c
g10/keylist.c
g10/mainproc.c
g10/options.h
g10/packet.h
g10/pkclist.c

diff --cc agent/command.c
Simple merge
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
diff --cc dirmngr/http.c
Simple merge
diff --cc doc/DETAILS
Simple merge
diff --cc doc/Makefile.am
Simple merge
diff --cc doc/gpg.texi
Simple merge
diff --cc g10/card-util.c
Simple merge
diff --cc g10/filter.h
@@@ -177,17 -140,14 +177,18 @@@ void        unarmor_pump_release (Unarm
  int         unarmor_pump (UnarmorPump x, int c);
  
  /*-- compress.c --*/
- void push_compress_filter(iobuf_t out,compress_filter_context_t *zfx,int algo);
- void push_compress_filter2(iobuf_t out,compress_filter_context_t *zfx,
-                          int algo,int rel);
+ gpg_error_t push_compress_filter (iobuf_t out, compress_filter_context_t *zfx,
+                                   int algo);
+ gpg_error_t push_compress_filter2 (iobuf_t out,compress_filter_context_t *zfx,
+                                    int algo, int rel);
  
  /*-- cipher.c --*/
 -int cipher_filter( void *opaque, int control,
 -                 iobuf_t chain, byte *buf, size_t *ret_len);
 +int cipher_filter_cfb (void *opaque, int control,
 +                       iobuf_t chain, byte *buf, size_t *ret_len);
 +
 +/*-- cipher-aead.c --*/
 +int cipher_filter_aead (void *opaque, int control,
 +                        iobuf_t chain, byte *buf, size_t *ret_len);
  
  /*-- textfilter.c --*/
  int text_filter( void *opaque, int control,
diff --cc g10/getkey.c
Simple merge
diff --cc g10/gpg.c
Simple merge
diff --cc g10/import.c
Simple merge
diff --cc g10/keydb.h
Simple merge
diff --cc g10/keyedit.c
Simple merge
diff --cc g10/keylist.c
Simple merge
diff --cc g10/mainproc.c
Simple merge
diff --cc g10/options.h
Simple merge
diff --cc g10/packet.h
Simple merge
diff --cc g10/pkclist.c
Simple merge