diff options
author | Werner Koch <wk@gnupg.org> | 1998-05-04 20:49:26 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 1998-05-04 20:49:26 +0200 |
commit | 42b03f6ebdda25a5b61db72cf9aecaaf6788de16 (patch) | |
tree | a36d2fe06b19dca6f64009010e2a731b45e6b886 /include | |
parent | fixed last passphrase bug (diff) | |
download | gnupg2-42b03f6ebdda25a5b61db72cf9aecaaf6788de16.tar.xz gnupg2-42b03f6ebdda25a5b61db72cf9aecaaf6788de16.zip |
new releaseV0-2-17
Diffstat (limited to 'include')
-rw-r--r-- | include/ChangeLog | 6 | ||||
-rw-r--r-- | include/cipher.h | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 94d967df3..9470baee4 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +Mon May 4 16:37:17 1998 Werner Koch (wk@isil.d.shuttle.de) + + * cipher.h (PUBKEY_ALGO_ELGAMAL_E): New, with value of the + old one. + * (is_ELGAMAL, is_RSA): New macros + Sun Apr 26 14:35:24 1998 Werner Koch (wk@isil.d.shuttle.de) * types.h: New type u64 diff --git a/include/cipher.h b/include/cipher.h index c82d35140..b64d234db 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -50,9 +50,9 @@ #define PUBKEY_ALGO_RSA 1 #define PUBKEY_ALGO_RSA_E 2 /* RSA encrypt only */ #define PUBKEY_ALGO_RSA_S 3 /* RSA sign only */ -#define PUBKEY_ALGO_ELGAMAL 16 +#define PUBKEY_ALGO_ELGAMAL_E 16 /* encrypt only ElGamal (but not vor v3)*/ #define PUBKEY_ALGO_DSA 17 -/*#define PUBKEY_ALGO_ELGAMAL 20 sign and encrypt elgamal */ +#define PUBKEY_ALGO_ELGAMAL 20 /* sign and encrypt elgamal */ #define DIGEST_ALGO_MD5 1 #define DIGEST_ALGO_SHA1 2 @@ -61,6 +61,10 @@ #define DIGEST_ALGO_TIGER 101 #endif +#define is_RSA(a) ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \ + || (a)==PUBKEY_ALGO_RSA_S ) +#define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL || (a)==PUBKEY_ALGO_ELGAMAL_E) + typedef struct { int algo; int keylen; |