deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apply GPG_DO_DISCRETIONARY from master

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-02-21 23:45:09 +09:00
parent ed61ed980d
commit 7c82839fba
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2013-02-22 Niibe Yutaka <gniibe@fsij.org>
* src/openpgp-do.c (GPG_DO_DISCRETIONARY, cmp_discretionary): New.
(cmp_app_data): Change to factor out GPG_DO_DISCRETIONARY.
(gpg_do_table): Add GPG_DO_DISCRETIONARY.
2013-02-15 Niibe Yutaka <gniibe@fsij.org> 2013-02-15 Niibe Yutaka <gniibe@fsij.org>
* Version 1.0.2. * Version 1.0.2.

11
src/openpgp-do.c
View File

@@ -241,7 +241,7 @@ static const struct do_table_entry *get_do_entry (uint16_t tag);
#define GPG_DO_LOGIN_DATA 0x005e #define GPG_DO_LOGIN_DATA 0x005e
#define GPG_DO_CH_DATA 0x0065 #define GPG_DO_CH_DATA 0x0065
#define GPG_DO_APP_DATA 0x006e #define GPG_DO_APP_DATA 0x006e
/* XXX: 0x0073 ??? */ #define GPG_DO_DISCRETIONARY 0x0073
#define GPG_DO_SS_TEMP 0x007a #define GPG_DO_SS_TEMP 0x007a
#define GPG_DO_DS_COUNT 0x0093 #define GPG_DO_DS_COUNT 0x0093
#define GPG_DO_EXTCAP 0x00c0 #define GPG_DO_EXTCAP 0x00c0
@@ -989,10 +989,14 @@ static const uint16_t cmp_ch_data[] = {
}; };
static const uint16_t cmp_app_data[] = { static const uint16_t cmp_app_data[] = {
10, 3,
GPG_DO_AID, GPG_DO_AID,
GPG_DO_HIST_BYTES, GPG_DO_HIST_BYTES,
/* XXX Discretionary data objects 0x0073 ??? */ GPG_DO_DISCRETIONARY,
};
static const uint16_t cmp_discretionary[] = {
8,
GPG_DO_EXTCAP, GPG_DO_EXTCAP,
GPG_DO_ALG_SIG, GPG_DO_ALG_DEC, GPG_DO_ALG_AUT, GPG_DO_ALG_SIG, GPG_DO_ALG_DEC, GPG_DO_ALG_AUT,
GPG_DO_PW_STATUS, GPG_DO_PW_STATUS,
@@ -1038,6 +1042,7 @@ gpg_do_table[] = {
/* Compound data: Read access only */ /* Compound data: Read access only */
{ GPG_DO_CH_DATA, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_ch_data }, { GPG_DO_CH_DATA, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_ch_data },
{ GPG_DO_APP_DATA, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_app_data }, { GPG_DO_APP_DATA, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_app_data },
{ GPG_DO_DISCRETIONARY, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_discretionary },
{ GPG_DO_SS_TEMP, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_ss_temp }, { GPG_DO_SS_TEMP, DO_CMP_READ, AC_ALWAYS, AC_NEVER, cmp_ss_temp },
/* Simple data: write access only */ /* Simple data: write access only */
{ GPG_DO_RESETTING_CODE, DO_PROC_WRITE, AC_NEVER, AC_ADMIN_AUTHORIZED, { GPG_DO_RESETTING_CODE, DO_PROC_WRITE, AC_NEVER, AC_ADMIN_AUTHORIZED,