[git] GnuPG - branch, master, updated. gnupg-2.1.0-19-g32e8566
by Werner Koch
cvs at cvs.gnupg.org
Mon Nov 17 13:10:43 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 32e85668b82f6fbcb824eea9548970804fb41d9e (commit)
via 165bc397bef1aaad1ad3b2554bb63525ba097c3b (commit)
from 9d897f8178610b4ce24f57d625dac71c679ce651 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 32e85668b82f6fbcb824eea9548970804fb41d9e
Author: Werner Koch <wk at gnupg.org>
Date: Mon Nov 17 13:08:23 2014 +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 at gnupg.org>
diff --git a/g10/mainproc.c b/g10/mainproc.c
index b84607a..d908d57 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -551,6 +551,7 @@ proc_encrypted (CTX c, PACKET *pkt)
int algo;
STRING2KEY s2kbuf;
STRING2KEY *s2k = NULL;
+ int canceled;
if (opt.override_session_key)
{
@@ -591,12 +592,16 @@ proc_encrypted (CTX c, PACKET *pkt)
log_info (_("assuming %s encrypted data\n"), "IDEA");
}
- c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL, NULL );
+ c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL, &canceled);
if (c->dek)
c->dek->algo_info_printed = 1;
+ else if (canceled)
+ result = gpg_error (GPG_ERR_CANCELED);
+ else
+ result = gpg_error (GPG_ERR_INV_PASSPHRASE);
}
}
- else if( !c->dek )
+ else if (!c->dek)
result = G10ERR_NO_SECKEY;
if (!result)
@@ -615,7 +620,7 @@ proc_encrypted (CTX c, PACKET *pkt)
else if (!opt.no_mdc_warn)
log_info (_("WARNING: message was not integrity protected\n"));
}
- else if (result == G10ERR_BAD_SIGN)
+ else if (gpg_err_code (result) == G10ERR_BAD_SIGN)
{
glo_ctrl.lasterr = result;
log_error (_("WARNING: encrypted message has been manipulated!\n"));
commit 165bc397bef1aaad1ad3b2554bb63525ba097c3b
Author: Werner Koch <wk at gnupg.org>
Date: Thu Nov 13 19:23:17 2014 +0100
speedo: Install -dev files for the libraries.
--
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index b43e5ff..aeab7a0 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -596,6 +596,10 @@ LangString DESC_Menu_gnupg_manual ${LANG_GERMAN} \
Section "-libgpg-error" SEC_libgpg_error
SetOutPath "$INSTDIR\bin"
File bin/libgpg-error-0.dll
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libgpg-error.imp lib/libgpg-error.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/gpg-error.h
SectionEnd
Section "-libiconv" SEC_libiconv
@@ -611,21 +615,37 @@ SectionEnd
Section "-npth" SEC_npth
SetOutPath "$INSTDIR\bin"
File bin/libnpth-0.dll
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libnpth.imp lib/libnpth.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/npth.h
SectionEnd
Section "-gcrypt" SEC_gcrypt
SetOutPath "$INSTDIR\bin"
File bin/libgcrypt-20.dll
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libgcrypt.imp lib/libgcrypt.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/gcrypt.h
SectionEnd
Section "-assuan" SEC_assuan
SetOutPath "$INSTDIR\bin"
File bin/libassuan-0.dll
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libassuan.imp lib/libassuan.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/assuan.h
SectionEnd
Section "-ksba" SEC_ksba
SetOutPath "$INSTDIR\bin"
File bin/libksba-8.dll
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libksba.imp lib/libksba.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/ksba.h
SectionEnd
Section "-gpgme" SEC_gpgme
@@ -633,6 +653,11 @@ Section "-gpgme" SEC_gpgme
File bin/libgpgme-11.dll
File bin/libgpgme-glib-11.dll
File libexec/gpgme-w32spawn.exe
+ SetOutPath "$INSTDIR\lib"
+ File /oname=libgpgme.imp lib/libgpgme.dll.a
+ File /oname=libgpgme-glib.imp lib/libgpgme-glib.dll.a
+ SetOutPath "$INSTDIR\include"
+ File include/gpgme.h
SectionEnd
Section "-gettext" SEC_gettext
@@ -984,22 +1009,32 @@ Section "-un.gpgme"
Delete "$INSTDIR\bin\libgpgme-11.dll"
Delete "$INSTDIR\bin\libgpgme-glib-11.dll"
Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
+ Delete "$INSTDIR\lib\libgpgme.imp"
+ Delete "$INSTDIR\include\gpgme.h"
SectionEnd
Section "-un.ksba"
Delete "$INSTDIR\bin\libksba-8.dll"
+ Delete "$INSTDIR\lib\libksba.imp"
+ Delete "$INSTDIR\include\ksba.h"
SectionEnd
Section "-un.assuan"
Delete "$INSTDIR\bin\libassuan-0.dll"
+ Delete "$INSTDIR\lib\libassuan.imp"
+ Delete "$INSTDIR\include\assuan.h"
SectionEnd
Section "-un.gcrypt"
Delete "$INSTDIR\bin\libgcrypt-20.dll"
+ Delete "$INSTDIR\lib\libgcrypt.imp"
+ Delete "$INSTDIR\include\gcrypt.h"
SectionEnd
Section "-un.npth"
Delete "$INSTDIR\bin\libnpth-0.dll"
+ Delete "$INSTDIR\lib\libnpth.imp"
+ Delete "$INSTDIR\include\npth.h"
SectionEnd
Section "-un.zlib"
@@ -1012,6 +1047,8 @@ SectionEnd
Section "-un.libgpg-error"
Delete "$INSTDIR\bin\libgpg-error-0.dll"
+ Delete "$INSTDIR\lib\libgpg-error.imp"
+ Delete "$INSTDIR\include\gpg-error.h"
SectionEnd
Section "-un.gnupg"
@@ -1038,6 +1075,7 @@ Section "-un.gnupginst"
# Try to remove the top level directories.
RMDir "$INSTDIR\bin"
RMDir "$INSTDIR\lib"
+ RMDir "$INSTDIR\include"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR\etc"
RMDir "$INSTDIR"
-----------------------------------------------------------------------
Summary of changes:
build-aux/speedo/w32/inst.nsi | 38 ++++++++++++++++++++++++++++++++++++++
g10/mainproc.c | 11 ++++++++---
2 files changed, 46 insertions(+), 3 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list