mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Fixed conflicts in NEWS g10/encrypt.c sm/encrypt.c sm/sign.c
This commit is contained in:
commit
2764ee309a
38 changed files with 1149 additions and 370 deletions
|
@ -122,6 +122,9 @@ typedef enum
|
|||
SIGSUBPKT_ATTST_SIGS = 37, /* Attested Certifications. */
|
||||
SIGSUBPKT_KEY_BLOCK = 38, /* Entire key used. */
|
||||
|
||||
SIGSUBPKT_META_HASH = 40, /* Literal Data Meta Hash. */
|
||||
SIGSUBPKT_TRUST_ALIAS = 41, /* Trust Alias. */
|
||||
|
||||
SIGSUBPKT_FLAG_CRITICAL = 128
|
||||
}
|
||||
sigsubpkttype_t;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue