diff options
| author | Werner Koch <wk@gnupg.org> | 2007-10-25 11:06:21 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-10-25 11:06:21 +0200 |
| commit | cd2d9288aaf9c584673675826ba76e7dbc2ad239 (patch) | |
| tree | 900265d44d0cbc9beb573867fa17148007f37d5f /g10/options.h | |
| parent | Add a /while loop. (diff) | |
| download | gnupg2-cd2d9288aaf9c584673675826ba76e7dbc2ad239.tar.xz gnupg2-cd2d9288aaf9c584673675826ba76e7dbc2ad239.zip | |
Ported changes from 1.4.
Add copyright notices.
Diffstat (limited to 'g10/options.h')
| -rw-r--r-- | g10/options.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/options.h b/g10/options.h index 5918d089e..be7394e35 100644 --- a/g10/options.h +++ b/g10/options.h @@ -1,6 +1,6 @@ /* options.h - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - * 2006 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + * 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -103,7 +103,8 @@ struct int force_ownertrust; enum { - CO_GNUPG=0, CO_RFC2440, CO_RFC1991, CO_PGP2, CO_PGP6, CO_PGP7, CO_PGP8 + CO_GNUPG, CO_RFC4880, CO_RFC2440, CO_RFC1991, CO_PGP2, + CO_PGP6, CO_PGP7, CO_PGP8 } compliance; enum { @@ -290,10 +291,12 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define GNUPG (opt.compliance==CO_GNUPG) #define RFC1991 (opt.compliance==CO_RFC1991 || opt.compliance==CO_PGP2) #define RFC2440 (opt.compliance==CO_RFC2440) +#define RFC4880 (opt.compliance==CO_RFC4880) #define PGP2 (opt.compliance==CO_PGP2) #define PGP6 (opt.compliance==CO_PGP6) #define PGP7 (opt.compliance==CO_PGP7) #define PGP8 (opt.compliance==CO_PGP8) +#define PGPX (PGP2 || PGP6 || PGP7 || PGP8) /* Various option flags. Note that there should be no common string names between the IMPORT_ and EXPORT_ flags as they can be mixed in |