From 7bbc07fde07f3fd57077887498bdff488ec96438 Mon Sep 17 00:00:00 2001 From: Andrey Jivsov Date: Wed, 5 Jan 2011 17:31:47 -0800 Subject: Make sure that --disable-optimization works in its attempt to replace -Ox with -O0. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b6ed4b34c..975733080 100644 --- a/configure.ac +++ b/configure.ac @@ -1466,7 +1466,7 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable compiler optimization]), [if test $enableval = no ; then - CFLAGS=`echo $CFLAGS | sed 's/-O[[0-9]]//'` + CFLAGS=`echo $CFLAGS | sed s/-O[[1-9]]\ /-O0\ /g` fi]) # -- cgit v1.2.3 From e0972d3d962548972872d889b362560e499340d1 Mon Sep 17 00:00:00 2001 From: Andrey Jivsov Date: Wed, 5 Jan 2011 17:33:17 -0800 Subject: Integrating http://code.google.com/p/gnupg-ecc/source/detail?r=15 . The following works: gpg2 --gen-key (ECC) gpg2 --list-keys gpg2 --list-packets ~/.gnupg/pubring.gpg gpg2 --list-packets ECDH doesn't work yet as the code must be re-written to adjust for gpg-agent refactoring. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 975733080..12545e260 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ min_automake_version="1.10" # Remember to change the version number immediately *after* a release. # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. -m4_define([my_version], [2.1.0]) +m4_define([my_version], [2.2.0]) m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ @@ -43,7 +43,7 @@ development_version=no NEED_GPG_ERROR_VERSION=1.8 NEED_LIBGCRYPT_API=1 -NEED_LIBGCRYPT_VERSION=1.4.0 +NEED_LIBGCRYPT_VERSION=1.6.0 NEED_LIBASSUAN_API=2 NEED_LIBASSUAN_VERSION=2.0.0 @@ -1466,7 +1466,7 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable compiler optimization]), [if test $enableval = no ; then - CFLAGS=`echo $CFLAGS | sed s/-O[[1-9]]\ /-O0\ /g` + CFLAGS=`echo $CFLAGS | sed s%-O[[1-9]]%-O0\ %g` fi]) # -- cgit v1.2.3 From ded546b4b5cc2caafa654d94ac8f69a23960427e Mon Sep 17 00:00:00 2001 From: Andrey Jivsov Date: Thu, 6 Jan 2011 15:44:01 -0800 Subject: Milestone: Data signing/verification and key signing/verification work with ECDSA. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 12545e260..575c1ec08 100644 --- a/configure.ac +++ b/configure.ac @@ -1466,7 +1466,7 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable compiler optimization]), [if test $enableval = no ; then - CFLAGS=`echo $CFLAGS | sed s%-O[[1-9]]%-O0\ %g` + CFLAGS=`echo $CFLAGS | sed s/-O[[1-9]]\ /-O0\ /g` fi]) # -- cgit v1.2.3 From 90b0ff23b7e51332592668e4034967c1aac1c593 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 21 Jan 2011 12:00:57 +0100 Subject: Editorial changes and allow building with old libgcrypts. Changed order of some conditional to make to put the special case into the true branch. Indentation changes. Minor other changes to make the ECC code more similar to the rest of our code. It builds but many sefltests still fail. Need to fix that before using it with an ECDH enabled libgcrypt. [/] 2011-01-21 Werner Koch * configure.ac: Need Libgcrypt 1.4.6 due to AESWRAP. (HAVE_GCRY_PK_ECDH): Add new test. [agent/] 2011-01-21 Werner Koch * cvt-openpgp.c (GCRY_PK_ECDH) [!HAVE_GCRY_PK_ECDH]: New. [include/] 2011-01-21 Werner Koch * cipher.h (GCRY_PK_USAGE_CERT): Remove compatibility macros because we now require libgcrypt 1.4.6. (GCRY_PK_ECDH): Add replacement. --- configure.ac | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 575c1ec08..ef6d2f9d7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ min_automake_version="1.10" # Remember to change the version number immediately *after* a release. # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. -m4_define([my_version], [2.2.0]) +m4_define([my_version], [2.1.0]) m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ @@ -43,7 +43,7 @@ development_version=no NEED_GPG_ERROR_VERSION=1.8 NEED_LIBGCRYPT_API=1 -NEED_LIBGCRYPT_VERSION=1.6.0 +NEED_LIBGCRYPT_VERSION=1.4.6 NEED_LIBASSUAN_API=2 NEED_LIBASSUAN_VERSION=2.0.0 @@ -724,6 +724,20 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", have_libgcrypt=yes,have_libgcrypt=no) +AC_CACHE_CHECK([whether Libgcrypt support ECDH], gnupg_cv_gcry_pk_ecdh, + [ _gnupg_gcry_save_cflags=$CFLAGS + CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" + AC_TRY_COMPILE( + [#include ], + [ return GCRY_PK_ECDH; ], + gnupg_cv_gcry_pk_ecdh=yes, + gnupg_cv_gcry_pk_ecdh=no) + CFLAGS=$_gnupg_gcry_save_cflags]) +if test "$gnupg_cv_gcry_pk_ecdh" = yes; then + AC_DEFINE([HAVE_GCRY_PK_ECDH], 1, + [Define if gcrypt.h has the enum value for ECDH.]) +fi + # # libassuan is used for IPC -- cgit v1.2.3 From e9d9e96d8ba464a1652552c33636819eed1e9f9a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 24 Jan 2011 15:50:37 +0100 Subject: Fix ECDH configure test --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a944e80ac..e24117b28 100644 --- a/configure.ac +++ b/configure.ac @@ -746,7 +746,7 @@ AC_CACHE_CHECK([whether Libgcrypt support ECDH], gnupg_cv_gcry_pk_ecdh, [ _gnupg_gcry_save_cflags=$CFLAGS CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" AC_TRY_COMPILE( - [#include ], + [#include ], [ return GCRY_PK_ECDH; ], gnupg_cv_gcry_pk_ecdh=yes, gnupg_cv_gcry_pk_ecdh=no) -- cgit v1.2.3 From 4659c923a08002a72cb4bb5b3c4e6a02d7484767 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Feb 2011 15:48:54 +0100 Subject: Sample ECC keys and message do now work. Import and export of secret keys does now work. Encryption has been fixed to be compatible with the sample messages. This version tests for new Libgcrypt function and thus needs to be build with a new Libgcrypt installed. --- configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e24117b28..1081b2d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -742,6 +742,7 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION", AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", have_libgcrypt=yes,have_libgcrypt=no) +# fixme: We can remove the next two checks if we require libgcrypt 1.5. AC_CACHE_CHECK([whether Libgcrypt support ECDH], gnupg_cv_gcry_pk_ecdh, [ _gnupg_gcry_save_cflags=$CFLAGS CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" @@ -756,6 +757,21 @@ if test "$gnupg_cv_gcry_pk_ecdh" = yes; then [Define if gcrypt.h has the enum value for ECDH.]) fi +AC_CACHE_CHECK([whether Libgcrypt has gcry_pk_get_curve], + gnupg_cv_gcry_pk_get_curve, + [ _gnupg_gcry_save_cflags=$CFLAGS + CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" + AC_TRY_COMPILE( + [#include ], + [ return gcry_pk_get_curve (NULL, 0, NULL); ], + gnupg_cv_gcry_pk_get_curve=yes, + gnupg_cv_gcry_pk_get_curve=no) + CFLAGS=$_gnupg_gcry_save_cflags]) +if test "$gnupg_cv_gcry_pk_get_curve" = yes; then + AC_DEFINE([HAVE_GCRY_PK_GET_CURVE], 1, + [Define if gcrypt.h has gcry_pk_get_curve.]) +fi + # # libassuan is used for IPC -- cgit v1.2.3