diff options
| author | Werner Koch <[email protected]> | 2018-04-10 08:14:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-04-10 08:14:30 +0000 |
| commit | 36373798c0955241288fb4aec103830106dd7e1f (patch) | |
| tree | fe0ed178d1aeda3847c9c8133a2ed8488a84644a /g10/keydb.h | |
| parent | Merge branch 'STABLE-BRANCH-2-2' into master (diff) | |
| parent | agent: Improve the unknown ssh flag detection. (diff) | |
| download | gnupg-36373798c0955241288fb4aec103830106dd7e1f.tar.gz gnupg-36373798c0955241288fb4aec103830106dd7e1f.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Fixed conflicts:
NEWS - keep master
configure.ac - merge
g10/card-util.c - mostly 2.2
g10/sig-check.c - 2.2
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index f2ea8a7d2..69365793c 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -26,13 +26,16 @@ #include "../common/util.h" #include "packet.h" -/* What qualifies as a certification (rather than a signature?) */ +/* What qualifies as a certification (key-signature in contrast to a + * data signature)? Note that a back signature is special and can be + * made by key and data signatures capable subkeys.) */ #define IS_CERT(s) (IS_KEY_SIG(s) || IS_UID_SIG(s) || IS_SUBKEY_SIG(s) \ || IS_KEY_REV(s) || IS_UID_REV(s) || IS_SUBKEY_REV(s)) #define IS_SIG(s) (!IS_CERT(s)) #define IS_KEY_SIG(s) ((s)->sig_class == 0x1f) #define IS_UID_SIG(s) (((s)->sig_class & ~3) == 0x10) #define IS_SUBKEY_SIG(s) ((s)->sig_class == 0x18) +#define IS_BACK_SIG(s) ((s)->sig_class == 0x19) #define IS_KEY_REV(s) ((s)->sig_class == 0x20) #define IS_UID_REV(s) ((s)->sig_class == 0x30) #define IS_SUBKEY_REV(s) ((s)->sig_class == 0x28) |