diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 8 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/cipher.h | 10 | ||||
| -rw-r--r-- | include/types.h | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 81ba48bab..09d5b6e99 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -226,7 +226,7 @@ * KEYSERVER_SCHEME_NOT_FOUND should be 127 to match the POSIX system() (via /bin/sh) way of signaling this. - + * Added G10ERR_KEYSERVER 2001-12-27 Werner Koch <[email protected]> @@ -256,7 +256,7 @@ 2001-08-24 Werner Koch <[email protected]> - * cipher.h (md_write): Made buf arg const. + * cipher.h (md_write): Made buf arg const. 2001-08-20 Werner Koch <[email protected]> @@ -266,7 +266,7 @@ never use __attribute__. * cipher.h, iobuf.h, memory.h, mpi.h [__riscos__]: extern hack. * i18n.h [__riscos__]: Use another include file - + 2001-05-30 Werner Koch <[email protected]> * ttyio.h (tty_printf): Add missing parenthesis for non gcc. @@ -442,5 +442,3 @@ Tue Mar 3 15:11:21 1998 Werner Koch ([email protected]) This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - diff --git a/include/Makefile.am b/include/Makefile.am index 25518bfa1..09176ded2 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = cipher.h types.h host2net.h _regex.h +EXTRA_DIST = cipher.h types.h host2net.h _regex.h diff --git a/include/cipher.h b/include/cipher.h index 4667e8043..db2196e74 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -1,4 +1,4 @@ -/* cipher.h - Definitions for OpenPGP +/* cipher.h - Definitions for OpenPGP * Copyright (C) 1998, 1999, 2000, 2001, 2006, * 2007, 2010 Free Software Foundation, Inc. * @@ -49,11 +49,11 @@ #define CIPHER_ALGO_CAMELLIA256 13 #define CIPHER_ALGO_DUMMY 110 /* No encryption at all. */ -#define PUBKEY_ALGO_RSA /* 1 */ GCRY_PK_RSA -#define PUBKEY_ALGO_RSA_E /* 2 */ GCRY_PK_RSA_E /* RSA encrypt only. */ +#define PUBKEY_ALGO_RSA /* 1 */ GCRY_PK_RSA +#define PUBKEY_ALGO_RSA_E /* 2 */ GCRY_PK_RSA_E /* RSA encrypt only. */ #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_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 */ @@ -86,7 +86,7 @@ #define is_DSA(a) ((a)==PUBKEY_ALGO_DSA) /* The data encryption key object. */ -typedef struct +typedef struct { int algo; int keylen; diff --git a/include/types.h b/include/types.h index 8a861bc0a..e13b11a69 100644 --- a/include/types.h +++ b/include/types.h @@ -48,7 +48,7 @@ #undef byte /* maybe there is a macro with this name */ #ifndef __riscos__ typedef unsigned char byte; -#else +#else /* Norcroft treats char = unsigned char as legal assignment but char* = unsigned char* as illegal assignment and the same applies to the signed variants as well */ |