gnupg.git
4 years agogpg: Fix possible read of unallocated memory
Werner Koch [Fri, 12 Dec 2014 09:41:25 +0000 (10:41 +0100)]
gpg: Fix possible read of unallocated memory

* g10/parse-packet.c (can_handle_critical): Check content length
before calling can_handle_critical_notation.
--

The problem was found by Jan Bee and gniibe proposed the used fix.
Thanks.

This bug can't be exploited: Only if the announced length of the
notation is 21 or 32 a memcmp against fixed strings using that length
would be done.  The compared data is followed by the actual signature
and thus it is highly likely that not even read of unallocated memory
will happen.  Nevertheless such a bug needs to be fixed.

Signed-off-by: Werner Koch <wk@gnupg.org>
4 years agoscd: Fix possibly inhibited checkpin of the admin pin.
Werner Koch [Fri, 12 Dec 2014 19:08:45 +0000 (20:08 +0100)]
scd: Fix possibly inhibited checkpin of the admin pin.

* scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
buffer.

Signed-off-by: Werner Koch <wk@gnupg.org>
4 years agoscd: fix get_public_key for OpenPGPcard v1.0.
Joshua Rogers [Sat, 20 Dec 2014 00:38:53 +0000 (11:38 +1100)]
scd: fix get_public_key for OpenPGPcard v1.0.

* scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.

--

Inside the get_public_key function, 'fp' was opened using popen, but
incorrectly closed using fclose.

Debian-Bug-Id: 773474

4 years agogpg: release DEK soon after its use.
NIIBE Yutaka [Fri, 12 Dec 2014 08:41:56 +0000 (17:41 +0900)]
gpg: release DEK soon after its use.

* g10/keygen.c (generate_subkeypair): Release DEK soon.

--

This fixes the out_of_core error in the test case of adding
RSA-4096 subkey to RSA-4096 primary key with configuration:

    s2k-cipher-algo S10

Debian-bug-id: 772780

4 years agodoc: Do not install gnupg.7
Werner Koch [Mon, 24 Nov 2014 19:01:45 +0000 (20:01 +0100)]
doc: Do not install gnupg.7

--
GnuPG-bug-id: 1770

4 years agogpg: Fix use of uninit.value in listing sig subpkts.
Werner Koch [Mon, 24 Nov 2014 18:41:46 +0000 (19:41 +0100)]
gpg: Fix use of uninit.value in listing sig subpkts.

* g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
sanitized.
--

We may not use "%s" to print an arbitrary buffer.  At least "%.*s"
should have been used.  However, it is in general preferable to escape
control characters while printf user data.

Reported-by: Hanno Böck
Signed-off-by: Werner Koch <wk@gnupg.org>
(backported from commit 596ae9f5433ca3b0e01f7acbe06fd2e424c42ae8)

4 years agogpg: Fix off-by-one read in the attribute subpacket parser.
Werner Koch [Mon, 24 Nov 2014 18:38:04 +0000 (19:38 +0100)]
gpg: Fix off-by-one read in the attribute subpacket parser.

* g10/parse-packet.c (parse_attribute_subpkts): Check that the
attribute packet is large enough for the subpacket type.
--

Reported-by: Hanno Böck
Signed-off-by: Werner Koch <wk@gnupg.org>
(backported from commit 0988764397f99db4efef1eabcdb8072d6159af76)

4 years agogpg: Fix a NULL-deref for invalid input data.
Werner Koch [Mon, 24 Nov 2014 18:32:47 +0000 (19:32 +0100)]
gpg: Fix a NULL-deref for invalid input data.

* g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
entry.
--

GnuPG-bug-id: 1761
Signed-off-by: Werner Koch <wk@gnupg.org>
(backported from commit 32e85668b82f6fbcb824eea9548970804fb41d9e)

4 years agogpg: Make the use of "--verify FILE" for detached sigs harder.
Werner Koch [Fri, 14 Nov 2014 08:36:19 +0000 (09:36 +0100)]
gpg: Make the use of "--verify FILE" for detached sigs harder.

* g10/openfile.c (open_sigfile): Factor some code out to ...
(get_matching_datafile): new function.
* g10/plaintext.c (hash_datafiles): Do not try to find matching file
in batch mode.
* g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
matching data file is not used by a standard signatures.
--

Allowing to use the abbreviated form for detached signatures is a long
standing bug which has only been noticed by the public with the
release of 2.1.0.  :-(

What we do is to remove the ability to check detached signature in
--batch using the one file abbreviated mode.  This should exhibit
problems in scripts which use this insecure practice.  We also print a
warning if a matching data file exists but was not considered because
the detached signature was actually a standard signature:

  gpgv: Good signature from "Werner Koch (dist sig)"
  gpgv: WARNING: not a detached signature; \
  file 'gnupg-2.1.0.tar.bz2' was NOT verified!

We can only print a warning because it is possible that a standard
signature is indeed to be verified but by coincidence a file with a
matching name is stored alongside the standard signature.

Reported-by: Simon Nicolussi (to gnupg-users on Nov 7)
Signed-off-by: Werner Koch <wk@gnupg.org>
(backported from commit 69384568f66a48eff3968bb1714aa13925580e9f)

Updated doc/gpg.texi.

4 years agogpg: Add import option "keep-ownertrust".
Werner Koch [Wed, 12 Nov 2014 08:56:40 +0000 (09:56 +0100)]
gpg: Add import option "keep-ownertrust".

* g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
* g10/import.c (parse_import_options): Add "keep-ownertrust".
(import_one): Act upon new option.
--

This option is in particular useful to convert from a pubring.gpg to
the new pubring.kbx in GnuPG 2.1 or vice versa:

gpg1 --export | gpg2 --import-options keep-ownertrust --import

(cherry-picked from commit da95d0d37841b34e2f3d7047f14ab4d98a7c0c56)

4 years agodoc: Minor fix
Werner Koch [Fri, 3 Oct 2014 18:21:28 +0000 (20:21 +0200)]
doc: Minor fix

--

Thanks to dkg for the reminder.

4 years agompi: Fix compiler warning.
Werner Koch [Fri, 3 Oct 2014 16:28:58 +0000 (18:28 +0200)]
mpi: Fix compiler warning.

* mpi/mpi-inv.c (mpi_invm): Do not return a value.

4 years agogpg: Add build and runtime support for larger RSA keys
Daniel Kahn Gillmor [Fri, 3 Oct 2014 16:01:11 +0000 (12:01 -0400)]
gpg: Add build and runtime support for larger RSA keys

* configure.ac: Added --enable-large-secmem option.
* g10/options.h: Add opt.flags.large_rsa.
* g10/gpg.c: Contingent on configure option: adjust secmem size,
add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
* g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
* doc/gpg.texi: Document --enable-large-rsa.

--

Some older implementations built and used RSA keys up to 16Kib, but
the larger secret keys now fail when used by more recent GnuPG, due to
secure memory limitations.

Building with ./configure --enable-large-secmem will make gpg
capable of working with those secret keys, as well as permitting the
use of a new gpg option --enable-large-rsa, which let gpg generate RSA
keys up to 8Kib when used with --batch --gen-key.

Debian-bug-id: 739424

Minor edits by wk.

GnuPG-bug-id: 1732

4 years agodoc: Cleanup gpg.texi.
Werner Koch [Mon, 29 Sep 2014 09:28:55 +0000 (11:28 +0200)]
doc: Cleanup gpg.texi.

--

We don't need the gpgone and gpgtwoone macros anymore.

4 years agodoc: Final update from master (gnupg 2.1)
Werner Koch [Mon, 29 Sep 2014 09:11:30 +0000 (11:11 +0200)]
doc: Final update from master (gnupg 2.1)

* doc/Makefile.am (sources_from_trunk): Remove.
(update-source): Make it a dummy.
* doc/gpg.texi: Update.
* doc/yat2m.c: Update.
--

Maintaining 3 versions in of the gpg manual in one file is getting
more complicated with 2.1.  Thus we stop this now and keep the manual
for 1.4 separate.

4 years agoAllow use of --debug-level=LEVEL without '='.
Werner Koch [Thu, 25 Sep 2014 07:47:28 +0000 (09:47 +0200)]
Allow use of --debug-level=LEVEL without '='.

* g10/gpg.c (opts): Fix "debug-level".

4 years agompi: Improve mpi_invm to detect bad input.
Werner Koch [Thu, 11 Sep 2014 15:06:16 +0000 (17:06 +0200)]
mpi: Improve mpi_invm to detect bad input.

* mpi/mpi-inv.c (mpi_invm): Return 0 for bad input.
--

Without this patch the function may enter an endless loop.  This is a
backport from libgcrypt.

GnuPG-bug-id: 1713

4 years agompi: Suppress set-but-unused-variables warnings.
Werner Koch [Wed, 20 Aug 2014 11:25:17 +0000 (13:25 +0200)]
mpi: Suppress set-but-unused-variables warnings.

* include/types.h (GNUPG_GCC_ATTR_UNUSED): Define for gcc >= 3.5.
* mpi/mpih-div.c (mpihelp_divmod_1, mpihelp_mod_1): Mark dummy as
 unused.
* mpi/mpi-internal.h (UDIV_QRNND_PREINV): Mark _ql as unused.
--

Due to the use of macros and longlong.h, we use variables which are
only used by some architectures.  At least gcc 4.7.2 prints new
warnings about set but not used variables.  This patch silences them.

4 years agoFix strict-alias warnings for rijndael.c
Werner Koch [Wed, 20 Aug 2014 10:22:35 +0000 (12:22 +0200)]
Fix strict-alias warnings for rijndael.c

* cipher/rijndael.c (do_setkey, prepare_decryption): Use u32_a_t cast.
--

This extends commit 0ad1458f827c7602ef7f1a4652af05641fd02b62

4 years agogpg: Allow compressed data with algorithm 0.
Werner Koch [Wed, 20 Aug 2014 10:05:16 +0000 (12:05 +0200)]
gpg: Allow compressed data with algorithm 0.

* g10/mainproc.c (proc_compressed): Remove superfluous check for
an algorithm number of 0.
--

(backport from commit 88633bf3d417aeb5ea0f75508aba8e32adc8acef)

GnuPG-bug-id: 1326, 1684

4 years agogpg: Fix regression due to the keyserver import filter.
Werner Koch [Wed, 6 Aug 2014 15:11:21 +0000 (17:11 +0200)]
gpg: Fix regression due to the keyserver import filter.

* g10/keyserver.c (keyserver_retrieval_filter): Change args.  Rewrite
to take subpakets in account.
* g10/import.c (import_one, import_secret_one): Pass keyblock to
filter.
--

GnuPG-bug-id: 1680

Resolved conflicts:
g10/main.h - s/import_filter/import_filter_t/g

4 years agoAdd kbnode_t for easier backporting.
Werner Koch [Wed, 6 Aug 2014 15:09:15 +0000 (17:09 +0200)]
Add kbnode_t for easier backporting.

* g10/global.h (kbnode_t): New.

4 years agoPost release updates
Werner Koch [Wed, 25 Jun 2014 12:33:34 +0000 (14:33 +0200)]
Post release updates

--

4 years agoRelease 1.4.18 gnupg-1.4.18
Werner Koch [Wed, 25 Jun 2014 12:33:34 +0000 (14:33 +0200)]
Release 1.4.18

4 years agoLimit keysize for unattended key generation to useful values.
Werner Koch [Wed, 25 Jun 2014 18:25:28 +0000 (20:25 +0200)]
Limit keysize for unattended key generation to useful values.

* g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
(gen_rsa): Enforce keysize 1024 to 4096.
(gen_dsa): Enforce keysize 768 to 3072.
--

It was possible to create 16k RSA keys in batch mode. In addition to
the silliness of such keys, they have the major drawback that GnuPG,
with its limited amount of specially secured memory areas, the use of
such keys may lead to an "out of secure memory" condition.

4 years agoMake screening of keyserver result work with multi-key commands.
Werner Koch [Wed, 25 Jun 2014 12:33:34 +0000 (14:33 +0200)]
Make screening of keyserver result work with multi-key commands.

* g10/keyserver.c (ks_retrieval_filter_arg_s): new.
(keyserver_retrieval_filter): Use new struct and check all
descriptions.
(keyserver_spawn): Pass filter arg suing the new struct.
--

This is a fix for commit 52303043.

The old code did only work for a single key.  It failed as soon as
several keys are specified ("gpg --refresh-keys" or "gpg --recv-key A
B C").

4 years agoAdd CVE number
Werner Koch [Tue, 24 Jun 2014 18:12:26 +0000 (20:12 +0200)]
Add CVE number

--

4 years agoPost release changes.
Werner Koch [Mon, 23 Jun 2014 15:42:21 +0000 (17:42 +0200)]
Post release changes.

--

4 years agoRelease 1.4.17 gnupg-1.4.17
Werner Koch [Mon, 23 Jun 2014 14:38:09 +0000 (16:38 +0200)]
Release 1.4.17

4 years agopo: Auto-update
Werner Koch [Mon, 23 Jun 2014 14:35:41 +0000 (16:35 +0200)]
po: Auto-update

--

4 years agodoc: Update from master.
Werner Koch [Mon, 23 Jun 2014 14:09:34 +0000 (16:09 +0200)]
doc: Update from master.

4 years agoFix syntax error introduced with 60bd6488
Werner Koch [Mon, 23 Jun 2014 15:14:15 +0000 (17:14 +0200)]
Fix syntax error introduced with 60bd6488

* g10/apdu.c (pcsc_dword_t): Fix syntax error.

4 years agoScreen keyserver responses.
Stefan Tomanek [Wed, 29 Jan 2014 23:57:43 +0000 (00:57 +0100)]
Screen keyserver responses.

* g10/main.h: Typedef import_filter for filter callbacks.
* g10/import.c (import): Add filter callbacks to param list.
(import_one): Ditto.
(import_secret_one): Ditto.
(import_keys_internal): Ditto.
(import_keys_stream): Ditto.
* g10/keyserver.c (keyserver_retrieval_filter): New.
(keyserver_spawn): Pass filter to import_keys_stream()

--
These changes introduces import functions that apply a constraining
filter to imported keys. These filters can verify the fingerprints of
the keys returned before importing them into the keyring, ensuring that
the keys fetched from the keyserver are in fact those selected by the
user beforehand.

Signed-off-by: Stefan Tomanek <tomanek@internet-sicherheit.de>
Re-indention and minor changes by wk.

4 years agoPrint hash algorithm in sig records
Werner Koch [Mon, 23 Jun 2014 12:57:32 +0000 (14:57 +0200)]
Print hash algorithm in sig records

* g10/keylist.c (list_keyblock_colon): Print field 16.
--

We have this info already in gnupg-2 and it is easy to add it to 1.4.

Debian-bug-id: 672658

Patch written and tested by Daniel Leidert.  See above.

4 years agoRemove useless diagnostic in MDC verification.
Werner Koch [Mon, 23 Jun 2014 11:24:43 +0000 (13:24 +0200)]
Remove useless diagnostic in MDC verification.

* g10/encr-data.c (decrypt_data): Do not distinguish between a bad MDC
packet header and a bad MDC.
--

The separate diagnostic was introduced for debugging a problems.  For
explaining an MDC error a single error message is easier to understand.

4 years agow32: Fix typo in README.W32.
Werner Koch [Mon, 23 Jun 2014 08:43:22 +0000 (10:43 +0200)]
w32: Fix typo in README.W32.

--
GnuPG-bug-id: 1488

4 years agointl: Fix for uClibc.
Werner Koch [Mon, 23 Jun 2014 08:22:32 +0000 (10:22 +0200)]
intl: Fix for uClibc.

* intl/localename.c (gl_locale_name_thread_unsafe): Take care of
uCLIBC.
--

Patch provided by "vriera".

GnuPG-bug-id: 1642

4 years agoPC/SC cleanup.
Werner Koch [Mon, 23 Jun 2014 07:58:34 +0000 (09:58 +0200)]
PC/SC cleanup.

* g10/apdu.c (pcsc_dword_t): New.  It was named as DWORD (double-word)
when a word was 16-bit.
(struct reader_table_s): Fixes for types.
(struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
Throughout: Fixes for types.
--

GnuPG-bug-id: 1358

This is a backport of commit ae22d629b6028aa994ff09f012e1cb029575eeae.

4 years agogpg: Use more specific reason codes for INV_RECP.
Werner Koch [Tue, 10 Jun 2014 12:54:55 +0000 (14:54 +0200)]
gpg: Use more specific reason codes for INV_RECP.

* g10/pkclist.c (build_pk_list): Use more specific reasons codes for
INV_RECP.
--

GnuPG-bug-id: 1650

Note that this patch is a bit more limited than the one in 2.1.

4 years agodoc: Remove outdated Russian man page.
Werner Koch [Mon, 23 Jun 2014 06:52:29 +0000 (08:52 +0200)]
doc: Remove outdated Russian man page.

* configure.ac (DOCBOOK_TO_MAN): Remove.
* doc/gpg.ru.sgml: Remove.
* doc/Makefile.am: Remove all gpg.ru related code.
--

The man page is outdated and we do not use docbook for a long time
now.  If someone wants to revive such a man page, it would be best to
translate the respective parts of the GnuPG manual in git master.

GnuPG-bug-id: 1652

4 years agogpg: Avoid infinite loop in uncompressing garbled packets.
Werner Koch [Fri, 20 Jun 2014 08:39:26 +0000 (10:39 +0200)]
gpg: Avoid infinite loop in uncompressing garbled packets.

* g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
--

A packet like (a3 01 5b ff) leads to an infinite loop.  Using
--max-output won't help if it is a partial packet.  This patch
actually fixes a regression introduced on 1999-05-31 (c34c6769).
Actually it would be sufficient to stuff just one extra 0xff byte.
Given that this problem popped up only after 15 years, I feel safer to
allow for a very few FF bytes.

Thanks to Olivier Levillain and Florian Maury for their detailed
report.

5 years agogpg: Need to init the trustdb for import.
Werner Koch [Thu, 6 Mar 2014 15:11:34 +0000 (16:11 +0100)]
gpg: Need to init the trustdb for import.

* g10/trustdb.c (clear_ownertrusts): Init trustdb.
--

This is actually a hack to fix a bug introduced with commit 2528178.
Debian uses it and thus we should do too.

GnuPG-bug-id: 1622

5 years agoSupport building using the latest mingw-w64 toolchain.
Werner Koch [Thu, 23 Jan 2014 14:19:35 +0000 (15:19 +0100)]
Support building using the latest mingw-w64 toolchain.

* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Change mingw detection.
--

  From: Stephen Kitt <skitt@debian.org>

  All MinGW targets require underscores when linking. This patch fixes
  acinclude.m4 and the resulting configure so they don't limit the use
  of underscores to the old mingw32msvc targets.

Debian-bug-id: 730271
Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoPost release version number bump.
Werner Koch [Fri, 13 Dec 2013 09:03:19 +0000 (10:03 +0100)]
Post release version number bump.

--

5 years agoRelease 1.4.16 gnupg-1.4.16
Werner Koch [Fri, 13 Dec 2013 08:07:11 +0000 (09:07 +0100)]
Release 1.4.16

5 years agoChange --show-session-key to print the session key earlier.
Werner Koch [Wed, 11 Dec 2013 09:20:15 +0000 (10:20 +0100)]
Change --show-session-key to print the session key earlier.

* g10/mainproc.c (proc_encrypted): Move show_session_key code to ...
* g10/decrypt-data.c (decrypt_data): here.
--

This feature can be used to return the session key for just a part of
a file.  For example to downloading just the first 32k of a huge file,
decrypting that incomplete part and while ignoring all the errors
break out the session key.  The session key may then be used on the
server to decrypt the entire file without the need to have the private
key on the server.

This is the same feature as
commit 101a54add351ff62793cbfbf3877787c4791f833 for 2.1 and
commit 3ae90ff28c500967cb90b1176299d2ca01ef450f for 2.0.

GnuPG-bug-id: 1389
Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoUpdate config.{guess,sub} and some copyright notices.
Werner Koch [Tue, 10 Dec 2013 19:33:48 +0000 (20:33 +0100)]
Update config.{guess,sub} and some copyright notices.

* scripts/config.guess, scripts/config.sub: Update to version
2013-11-29.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoPrepare for newer automakes which default to parallel tests.
Werner Koch [Tue, 22 Oct 2013 12:26:53 +0000 (14:26 +0200)]
Prepare for newer automakes which default to parallel tests.

* checks/Makefile.am: Add a list of test dependencies.
--

We want to keep the tests in a specific order because that helps to
compare tests and some tests rely on others anyway.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoNormalize the MPIs used as input to secret key functions.
Werner Koch [Wed, 27 Nov 2013 13:22:10 +0000 (14:22 +0100)]
Normalize the MPIs used as input to secret key functions.

* cipher/rsa.c (secret): Normalize the INPUT.
(rsa_decrypt): Pass reduced data to secret.
* cipher/elgamal.c (decrypt): Normalize A and B.
* cipher/dsa.c (sign): Normalize HASH.
--

mpi_normalize is in general not required because extra leading zeroes
do not harm the computation.  However, adding extra all zero limbs or
padding with multiples of N may be useful in side-channel attacks. In
particular they are used by the acoustic crypt-analysis.  This is an
extra pre-caution which alone would not be sufficient to mitigate the
described attack.

CVE-id: CVE-2013-4576

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoUse blinding for the RSA secret operation.
Werner Koch [Tue, 22 Oct 2013 12:26:53 +0000 (14:26 +0200)]
Use blinding for the RSA secret operation.

* cipher/random.c (randomize_mpi): New.
* g10/gpgv.c (randomize_mpi): New stub.
* cipher/rsa.c (USE_BLINDING): Define macro.
(secret): Implement blinding.
--

GPG 1.x has never used any protection against timing attacks on the
RSA secret operation.  The rationale for this has been that there was
no way to mount a remote timing attack on GnuPG.  With the turning up
of Acoustic Cryptanalysis (http://cs.tau.ac.il/~tromer/acoustic) this
assumption no longer holds true and thus we need to do do something
about it.  Blinding seems to be a suitable mitigation to the threat of
key extraction.  It does not help against distinguishing used keys,
though.

Note that GPG 2.x uses Libgcrypt which does blinding by default.

The performance penalty is negligible: Modifying the core pubkey_sign
or pubkey_decrypt function to run 100 times in a loop, the entire
execution times for signing or decrypting a small message using a 4K
RSA key on a Thinkpad X220 are

  Without blinding:  5.2s  (8.9s)
  With blinding:     5.6s  (9.3s)

The numbers in parentheses give the values without the recently
implemented k-ary exponentiation code.  Thus for the next release the
user will actually experience faster signing and decryption.  A
drawback of blinding is that we need random numbers even for
decryption (albeit at low quality).

Signed-off-by: Werner Koch <wk@gnupg.org>
CVE-id: CVE-2013-4576

5 years agogpg: Change armor Version header to emit only the major version.
Werner Koch [Wed, 27 Nov 2013 08:20:02 +0000 (09:20 +0100)]
gpg: Change armor Version header to emit only the major version.

* g10/options.h (opt): Rename field no_version to emit_version.
* g10/gpg.c (main): Init opt.emit_vesion to 1.  Change --emit-version
to bump up opt.emit_version.
* g10/armor.c (armor_filter): Implement different --emit-version
values.
--

GnuPG-bug-id: 1572
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e951782e937ce290be0d89d83e84b3daea997587)

Resolved conflicts:
NEWS
g10/armor.c
g10/gpg.c

5 years agompi: mpi-pow improvements
Werner Koch [Fri, 18 Oct 2013 08:54:55 +0000 (10:54 +0200)]
mpi: mpi-pow improvements

* mpi/mpi-pow.c (USE_ALGORITHM_SIMPLE_EXPONENTIATION): New.
(mul_mod) [!USE_ALGORITHM_SIMPLE_EXPONENTIATION]: New.
(mpi_powm) [!USE_ALGORITHM_SIMPLE_EXPONENTIATION]: New implementation
of left-to-right k-ary exponentiation.
--

This is a backport from Libgcrypt commit
45aa6131e93fac89d46733b3436d960f35fb99b2

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
    For the Yarom/Falkner flush+reload cache side-channel attack, we
    changed the code so that it always calls the multiplication
    routine (even if we can skip it to get result).  This results some
    performance regression.

    This change is for recovering performance with efficient
    algorithm.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoPrint the keyid for key packets with --list-packets.
Werner Koch [Fri, 18 Oct 2013 08:24:32 +0000 (10:24 +0200)]
Print the keyid for key packets with --list-packets.

* g10/parse-packet.c (parse_key): Add keyid printing.
--

This is backport from GnuPG-2.  Note that the --list-packets command
is for debugging only and not part iof the stable API.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agompi: Fix syntax error for mips64 and gcc < 4.4
Werner Koch [Fri, 11 Oct 2013 12:11:43 +0000 (14:11 +0200)]
mpi: Fix syntax error for mips64 and gcc < 4.4

* mpi/longlong.h [__mips && gcc < 4.4]: Fix cpp syntax error.
--

GnuPG-bug-id: 1465

5 years agogpg: Do not require a trustdb with --always-trust.
Werner Koch [Fri, 11 Oct 2013 07:25:58 +0000 (09:25 +0200)]
gpg: Do not require a trustdb with --always-trust.

* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
* g10/trustdb.c (trustdb_args): Add field no_trustdb.
(init_trustdb): Set that field.
(revalidation_mark):  Take care of a nonexistent trustdb file.
(read_trust_options): Ditto.
(get_ownertrust): Ditto.
(get_min_ownertrust): Ditto.
(update_ownertrust): Ditto.
(update_min_ownertrust): Ditto.
(clear_ownertrusts): Ditto.
(cache_disabled_value): Ditto.
(check_trustdb_stale): Ditto.
(get_validity): Ditto.
* g10/gpg.c (main): Do not create a trustdb with most commands for
trust-model always.
--

This slightly changes the semantics of most commands in that they
won't create a trustdb if --trust-model=always is used.  It just does
not make sense to create a trustdb if there is no need for it.

Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 1a0eeaacd1bf09fe5125dbc3f56016bc20f3512e)

Resolved conflicts:
g10/gpg.c
g10/tdbio.h
g10/trustdb.c
 (indentation fixes)

5 years agoPost release updates.
Werner Koch [Fri, 4 Oct 2013 19:29:50 +0000 (21:29 +0200)]
Post release updates.

--

5 years agoRelease 1.4.15 gnupg-1.4.15
Werner Koch [Fri, 4 Oct 2013 19:10:52 +0000 (21:10 +0200)]
Release 1.4.15

5 years agopo: Autoupdate due to changed order of strings.
Werner Koch [Fri, 4 Oct 2013 19:03:40 +0000 (21:03 +0200)]
po: Autoupdate due to changed order of strings.

--

5 years agodoc: Update from master.
Werner Koch [Fri, 4 Oct 2013 19:01:16 +0000 (21:01 +0200)]
doc: Update from master.

5 years agogpg: Print a "not found" message for an unknown key in --key-edit.
Werner Koch [Fri, 4 Oct 2013 16:34:56 +0000 (18:34 +0200)]
gpg: Print a "not found" message for an unknown key in --key-edit.

* g10/keyedit.c (keyedit_menu): Print message.
--

GnuPG-bug-id: 1420
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 0bf54e60d31389812d05c3fd29bece876204561d)

5 years agogpg: Protect against rogue keyservers sending secret keys.
Werner Koch [Fri, 4 Oct 2013 11:44:39 +0000 (13:44 +0200)]
gpg: Protect against rogue keyservers sending secret keys.

* g10/options.h (IMPORT_NO_SECKEY): New.
* g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
flag.
* g10/import.c (import_secret_one): Deny import if flag is set.
--

By modifying a keyserver or a DNS record to send a secret key, an
attacker could trick a user into signing using a different key and
user id.  The trust model should protect against such rogue keys but
we better make sure that secret keys are never received from remote
sources.

Suggested-by: Stefan Tomanek
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e7abed3448c1c1a4e756c12f95b665b517d22ebe)

Resolved conflicts:
g10/options.h

5 years agogpg: Allow setting of all zero key flags
Daniel Kahn Gillmor [Tue, 19 Mar 2013 15:25:25 +0000 (11:25 -0400)]
gpg: Allow setting of all zero key flags

* g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
(cherry picked from commit b693ec02c467696bf9d7324dd081e279f9965151)
(cherry picked from commit dd868acb0d13a9f119c0536777350a6c237a66a1)

5 years agogpg: Distinguish between missing and cleared key flags.
Werner Koch [Fri, 15 Mar 2013 14:46:03 +0000 (15:46 +0100)]
gpg: Distinguish between missing and cleared key flags.

* include/cipher.h (PUBKEY_USAGE_NONE): New.
* g10/getkey.c (parse_key_usage): Set new flag.
--

We do not want to use the default capabilities (derived from the
algorithm) if any key flags are given in a signature.  Thus if key
flags are used in any way, the default key capabilities are never
used.

This allows to create a key with key flags set to all zero so it can't
be used.  This better reflects common sense.
(cherry picked from commit 4bde12206c5bf199dc6e12a74af8da4558ba41bf)
(cherry picked from commit 0a805ed1604ef3e9b27f3e22a936a2d439300e9f)

Resolved conflicts:
include/cipher.h

5 years agokeyserver: Allow use of cURL's default CA store.
Werner Koch [Fri, 4 Oct 2013 06:28:12 +0000 (08:28 +0200)]
keyserver: Allow use of cURL's default CA store.

* keyserver/gpgkeys_curl.c (main): Set CURLOPT_CAINFO only if a file
has been given.
* keyserver/gpgkeys_hkp.c (main): Ditto.
--

GnuPG-bug-id: 1542
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e957b9b3f408491f36660499b215aebcf2633a95)

5 years agogpg: Limit the nesting level of I/O filters.
Werner Koch [Fri, 4 Oct 2013 06:20:49 +0000 (08:20 +0200)]
gpg: Limit the nesting level of I/O filters.

* until/iobuf.c (MAX_NESTING_FILTER): New.
(iobuf_push_filter2): Limit the nesting level.
--

This is a more general fix for the nested compression packet bug.  In
particular this helps g10/import.c:read_block to stop pushing
compression filters onto an iobuf stream.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agogpg: Fix bug with deeply nested compressed packets.
Werner Koch [Wed, 2 Oct 2013 07:11:43 +0000 (09:11 +0200)]
gpg: Fix bug with deeply nested compressed packets.

* g10/mainproc.c (MAX_NESTING_DEPTH): New.
(proc_compressed): Return an error code.
(check_nesting): New.
(do_proc_packets): Check packet nesting depth.  Handle errors from
check_compressed.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoFix bug in mpi_tdiv_q_2exp.
Werner Koch [Mon, 16 Sep 2013 13:57:01 +0000 (15:57 +0200)]
Fix bug in mpi_tdiv_q_2exp.

* mpi/mpi-internal.h (MPN_COPY_INCR): Make it work.
--

This bug has been with us since the version 0.0.0 of GnuPG.
Fortunately it only affects an optimized code path which is rarely
used in practice: If the shift size matches the size of a
limb (i.e.. 32 or 64); this is is_prime in primegen.c.  Over there the
Rabin-Miller test may fail with a probability of 2^-31 (that is if the
to be tested prime - 1 has the low 32 bits cleared).  In practice the
probability is even much less because we first do a Fermat test on the
randomly generated candidates which sorts out the majority of
composite numbers.

The bug in MPN_COPY_INCR was found by Sven Bjorn.

Signed-off-by: Werner Koch <wk@gnupg.org>
(back ported from Libgcrypt
 commit 7f7a5ef59962ae1a819b5060f9b781469bfe27d5)

5 years agompicalc: Change copyright notice.
Werner Koch [Wed, 4 Sep 2013 13:25:18 +0000 (15:25 +0200)]
mpicalc: Change copyright notice.

--

Except for a minor change by David Shaw, all code has been written by
me.  After termination of my copyright assignment, I change that
notice to reflect the new legal state.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agogpg: Use 2048 as the default keysize in batch mode.
Werner Koch [Fri, 30 Aug 2013 08:19:14 +0000 (10:19 +0200)]
gpg: Use 2048 as the default keysize in batch mode.

* g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
2048.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agogpg: No need to create a trustdb when encrypting with --always-trust.
Werner Koch [Fri, 2 Aug 2013 07:17:52 +0000 (09:17 +0200)]
gpg: No need to create a trustdb when encrypting with --always-trust.

* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
--

(back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoPost release updates.
Werner Koch [Thu, 25 Jul 2013 09:00:04 +0000 (11:00 +0200)]
Post release updates.

--

5 years agoRelease 1.4.14. gnupg-1.4.14
Werner Koch [Thu, 25 Jul 2013 07:33:23 +0000 (09:33 +0200)]
Release 1.4.14.

5 years agoAutoupdate a translation.
Werner Koch [Thu, 25 Jul 2013 08:44:01 +0000 (10:44 +0200)]
Autoupdate a translation.

--

5 years agoUpdate Chinese translation.
Jedi Lin [Thu, 25 Jul 2013 07:30:05 +0000 (09:30 +0200)]
Update Chinese translation.

5 years agoUpdate to modern beta release numbering scheme.
Werner Koch [Thu, 25 Jul 2013 07:21:46 +0000 (09:21 +0200)]
Update to modern beta release numbering scheme.

* configure.ac: s/my_/mym4_/.  Add new release building code.

5 years agoPrepare for a forthcoming new algorithm id.
Werner Koch [Thu, 25 Jul 2013 07:11:08 +0000 (09:11 +0200)]
Prepare for a forthcoming new algorithm id.

* include/cipher.h (PUBKEY_ALGO_ECC): New.
* g10/keyid.c (pubkey_letter): Add letter 'C'.
--

ID 22 will be used for generic ECC, i.e. one which can be used for
ECDSA and ECDH.  The only support in 1.4 will pretty printing the
algorithm id.

5 years agoMitigate a flush+reload cache attack on RSA secret exponents.
Werner Koch [Fri, 19 Jul 2013 11:49:23 +0000 (13:49 +0200)]
Mitigate a flush+reload cache attack on RSA secret exponents.

* mpi/mpi-pow.c (mpi_powm): Always perform the mpi_mul for exponents
hold in secure memory.
--

The attack is described in a paper to be pusblished at eprint.iacr.org:

Flush+Reload: a High Resolution, Low Noise, L3 Cache Side-Channel
Attack by Yuval Yarom and Katrina Falkner. 18 July 2013.

  Flush+Reload is a cache side-channel attack that monitors access to
  data in shared pages. In this paper we demonstrate how to use the
  attack to extract private encryption keys from GnuPG.  The high
  resolution and low noise of the Flush+Reload attack enables a spy
  program to recover over 98% of the bits of the private key in a
  single decryption or signing round. Unlike previous attacks, the
  attack targets the last level L3 cache. Consequently, the spy
  program and the victim do not need to share the execution core of
  the CPU. The attack is not limited to a traditional OS and can be
  used in a virtualised environment, where it can attack programs
  executing in a different VM.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agoFix git revision parsing.
Werner Koch [Fri, 19 Jul 2013 11:56:24 +0000 (13:56 +0200)]
Fix git revision parsing.

* configure.ac: Use git rev-parse to retrieve the revision.

Signed-off-by: Werner Koch <wk@gnupg.org>
5 years agogpg: fix previous change
NIIBE Yutaka [Tue, 16 Jul 2013 00:21:54 +0000 (09:21 +0900)]
gpg: fix previous change

* g10/gpgv.c: Fix void dotlock_remove_lockfiles.

5 years agogpg: signal handling fix
NIIBE Yutaka [Fri, 12 Jul 2013 08:26:55 +0000 (17:26 +0900)]
gpg: signal handling fix

* include/dotlock.h (dotlock_remove_lockfiles_reclaim): New.
  (dotlock_destroy, dotlock_remove_lockfiles): Add a flag to reclaim
  memory or not.
* util/dotlock.c (dotlock_create): Use
  dotlock_remove_lockfiles_reclaim for atexit.
  (dotlock_destroy_unix, dotlock_destroy)
  (dotlock_remove_lockfiles): Add a reclaim flag.
  (dotlock_remove_lockfiles_reclaim): New.
* g10/signal.c (got_fatal_signal): Disable flag of reclaim memory to
  avoid non-async-face call.
* g10/keydb.c (maybe_create_keyring): Follow the API change.
* g10/gpgv.c: Follow the API change.

--

signal handler got_fatal_signal should not call non-async-signal-safe
functions.  When malloc is interrupted by a signal, it screws up.

This issue is reported:
https://bugs.g10code.com/gnupg/issue1515
http://bugs.debian.org/399904

6 years agoDifferentiate between success (full or partial), not-found, and failure.
David Shaw [Sun, 3 Mar 2013 01:39:48 +0000 (20:39 -0500)]
Differentiate between success (full or partial), not-found, and failure.

* keyserver/gpgkeys_hkp.c (get_key): Use curl_easy_setinfo to get the
  HTTP status code so we can tell the difference between a successful
  retrieval, a partial retrieval, a not-found, or a server failed.

6 years agoEmulate curl_easy_getinfo and CURLINFO_RESPONSE_CODE in curl-shim.
David Shaw [Sun, 3 Mar 2013 01:07:27 +0000 (20:07 -0500)]
Emulate curl_easy_getinfo and CURLINFO_RESPONSE_CODE in curl-shim.

* keyserver/curl-shim.h, keyserver/curl-shim.c (curl_easy_getinfo):
  New. Return the HTTP status code for the last transfer.

6 years agoFix DNS check for recent OS X releases
David Shaw [Wed, 30 Jan 2013 01:31:01 +0000 (20:31 -0500)]
Fix DNS check for recent OS X releases

* configure.ac: OS X now needs BIND_8_COMPAT and -lresolv

6 years agoAutomake 1.13 compatibility fix.
Werner Koch [Fri, 11 Jan 2013 14:42:32 +0000 (15:42 +0100)]
Automake 1.13 compatibility fix.

* configure.ac: s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/.
--
GnuPG-bug-id: 1459

6 years agoFix idea.c for big endian CPUs.
Werner Koch [Fri, 11 Jan 2013 14:10:38 +0000 (15:10 +0100)]
Fix idea.c for big endian CPUs.

* cipher/idea.c: Replace use of WORDS_BIGENDIAN by BIG_ENDIAN_HOST.
--
GnuPG-bug-id: 1461

6 years agoFix honoring --cert-digest-algo when recreating a cert
Christian Aistleitner [Sun, 14 Oct 2012 18:33:00 +0000 (20:33 +0200)]
Fix honoring --cert-digest-algo when recreating a cert

* g10/sign.c (update_keysig_packet): Override original signature's
digest algo in hashed data.

6 years agoPost release updates
Werner Koch [Thu, 20 Dec 2012 20:25:07 +0000 (21:25 +0100)]
Post release updates

--

6 years agoRelease 1.4.13. gnupg-1.4.13
Werner Koch [Thu, 20 Dec 2012 19:30:15 +0000 (20:30 +0100)]
Release 1.4.13.

6 years agoLast fix for the SRV record patches.
Werner Koch [Thu, 20 Dec 2012 19:28:21 +0000 (20:28 +0100)]
Last fix for the SRV record patches.

* keyserver/gpgkeys_hkp.c (srv_replace): Make sure SRVCOUNT is
always initialized.
--

See commit 5c557a51.

6 years agoUpdate manuals from master
Werner Koch [Thu, 20 Dec 2012 19:12:50 +0000 (20:12 +0100)]
Update manuals from master

* doc/Makefile.am (update-source): Copy from Git master.
(update-source-from-gnupg-2): Remove.
* doc/gpg.texi: Fix minor typos and grammar bugs.
* doc/yat2m.c: Change diagnostics to updated coding standards.

6 years agoUpdate config.{guess,sub} to version 2012-07-31.
Werner Koch [Thu, 20 Dec 2012 18:53:58 +0000 (19:53 +0100)]
Update config.{guess,sub} to version 2012-07-31.

* scripts/config.guess, scripts/config.sub: Update.

6 years agopo: Update Danish translation.
Joe Hansen [Thu, 1 Nov 2012 15:44:29 +0000 (11:44 -0400)]
po: Update Danish translation.

* po/da.po: Update.

6 years agopo: Update zh_TW.po.
Werner Koch [Thu, 20 Dec 2012 17:36:27 +0000 (18:36 +0100)]
po: Update zh_TW.po.

--

Applied changes from Jedi Lin as received in May and fixed fuzzies due
to English typo corrections.

6 years agogpg: Suppress "public key already present" in quiet mode.
Werner Koch [Wed, 19 Dec 2012 10:21:26 +0000 (11:21 +0100)]
gpg: Suppress "public key already present" in quiet mode.

* g10/pkclist.c (build_pk_list): Print two diagnostics only in
non-quiet mode.
--

(back-ported from commit 8325d616593187ff227853de0295e3269b96edcb)

6 years agoImport only packets which are allowed in a keyblock.
Werner Koch [Thu, 20 Dec 2012 08:43:41 +0000 (09:43 +0100)]
Import only packets which are allowed in a keyblock.

* g10/import.c (valid_keyblock_packet): New.
(read_block): Store only valid packets.
--

A corrupted key, which for example included a mangled public key
encrypted packet, used to corrupt the keyring.  This change skips all
packets which are not allowed in a keyblock.

GnuPG-bug-id: 1455

6 years agoIssue 1447: Pass proper Host header and SNI when SRV is used with curl.
David Shaw [Wed, 19 Dec 2012 18:54:27 +0000 (13:54 -0500)]
Issue 1447: Pass proper Host header and SNI when SRV is used with curl.

* configure.ac: Check for inet_ntop.

* m4/libcurl.m4: Provide a #define for the version of the curl
  library.

* keyserver/gpgkeys_hkp.c (main, srv_replace): Call getaddrinfo() on
  each target.  Once we find one that resolves to an address (whether
  IPv4 or IPv6), pass it into libcurl via CURLOPT_RESOLVE using the
  SRV name as the "host".  Force the HTTP Host header to be the same.

Backported from 6b1f71055ebab36989e2089cfde319d2ba40ada7

* keyserver/gpgkeys_hkp.c (main): Only default try-dns-srv to on if we
  have SRV support in the first place.

Backported from 732f3d1d4786239db5f31f82cc04ec79326cc13c

6 years agoPart of issue 1447: Pass proper Host header when SRV is used.
David Shaw [Wed, 19 Dec 2012 16:43:28 +0000 (11:43 -0500)]
Part of issue 1447: Pass proper Host header when SRV is used.

* common/http.c (send_request, connect_server): Set proper Host header
  (no :port, host is that of the SRV) when SRV is used in the
  curl-shim.

Backported from cbe98b2cb1e40ba253300e604996681ae191e363

6 years agoRemove trailing white space from some files
Werner Koch [Wed, 19 Dec 2012 13:05:56 +0000 (14:05 +0100)]
Remove trailing white space from some files

--

6 years agoAdjust to GNU coding standards
Werner Koch [Wed, 19 Dec 2012 13:03:25 +0000 (14:03 +0100)]
Adjust to GNU coding standards

--

A variable definition with initialization shall have only one variable
per type.

6 years agoFix last commit
Werner Koch [Wed, 19 Dec 2012 12:57:29 +0000 (13:57 +0100)]
Fix last commit

* util/http.c (connect_server): Bump SRVINDEX and not SRV.