diff options
| author | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
| commit | 38904b697c4d27a70281149c6070e6dfca4e893b (patch) | |
| tree | 72ae98a01f64dbe2df74d9687faba0c97159d799 /include | |
| parent | Add gitattributes (diff) | |
| parent | Finished ECC integration. (diff) | |
| download | gnupg-ecc-integration-done.tar.gz gnupg-ecc-integration-done.zip | |
Merge branch 'ECC-INTEGRATION-2-1'ecc-integration-done
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 11 | ||||
| -rw-r--r-- | include/cipher.h | 14 |
2 files changed, 18 insertions, 7 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 339800f37..81ba48bab 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,14 @@ +2011-02-01 Werner Koch <[email protected]> + + * cipher.h (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY): Bump up to + accommodate gcrypt ECC keys. + +2011-01-21 Werner Koch <[email protected]> + + * cipher.h (GCRY_PK_USAGE_CERT): Remove compatibility macros + because we now require libgcrypt 1.4.6. + (GCRY_PK_ECDH): Add replacement. + 2009-08-20 Daiki Ueno <[email protected]> (wk) * cipher.h (struct DEK): Add field S2K_CACHEID. diff --git a/include/cipher.h b/include/cipher.h index 8e198283d..4667e8043 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -1,6 +1,6 @@ /* cipher.h - Definitions for OpenPGP * Copyright (C) 1998, 1999, 2000, 2001, 2006, - * 2007 Free Software Foundation, Inc. + * 2007, 2010 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -23,10 +23,8 @@ #include <gcrypt.h> /* Macros for compatibility with older libgcrypt versions. */ -#ifndef GCRY_PK_USAGE_CERT -# define GCRY_PK_USAGE_CERT 4 -# define GCRY_PK_USAGE_AUTH 8 -# define GCRY_PK_USAGE_UNKN 128 +#ifndef HAVE_GCRY_PK_ECDH +# define GCRY_PK_ECDH 302 #endif @@ -56,6 +54,8 @@ #define PUBKEY_ALGO_RSA_S /* 3 */ GCRY_PK_RSA_S /* RSA sign only. */ #define PUBKEY_ALGO_ELGAMAL_E /* 16 */ GCRY_PK_ELG_E /* Elgamal encr only */ #define PUBKEY_ALGO_DSA /* 17 */ GCRY_PK_DSA +#define PUBKEY_ALGO_ECDH 18 +#define PUBKEY_ALGO_ECDSA 19 #define PUBKEY_ALGO_ELGAMAL /* 20 */ GCRY_PK_ELG /* Elgamal encr+sign */ #define PUBKEY_USAGE_SIG GCRY_PK_USAGE_SIGN /* Good for signatures. */ @@ -100,8 +100,8 @@ typedef struct /* Constants to allocate static MPI arrays. */ -#define PUBKEY_MAX_NPKEY 4 -#define PUBKEY_MAX_NSKEY 6 +#define PUBKEY_MAX_NPKEY 5 +#define PUBKEY_MAX_NSKEY 7 #define PUBKEY_MAX_NSIG 2 #define PUBKEY_MAX_NENC 2 |