security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd:openpgp: Rename an internal variable.

Browse Source 
* scd/app-openpgp.c (struct app_local_s): s/extcap_v3/is_v3/.
s/max_certlen_3/max_certlen.  Change users.
--

The extcap_v3 flag is set if the version is 3 or later and as such
does not only declare that the v3 extcap layout is used.  Make this
clear by renaming.

Likewise for max_certlen_3.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2021-03-19 15:15:43 +01:00
parent d5fb598323
commit bbdb48ec0d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scd/app-openpgp.c
View File

@ -83,7 +83,7 @@ static struct {
status bytes. */ status bytes. */
unsigned int try_extlen:2; /* Large object; try to use an extended unsigned int try_extlen:2; /* Large object; try to use an extended
length APDU when !=0. The size is length APDU when !=0. The size is
determined by extcap.max_certlen_3 determined by extcap.max_certlen
when == 1, and by extcap.max_special_do when == 1, and by extcap.max_special_do
when == 2. */ when == 2. */
char *desc; char *desc;
@ -191,7 +191,7 @@ struct app_local_s {
struct struct
{ {
unsigned int is_v2:1; /* Compatible to v2 or later. */ unsigned int is_v2:1; /* Compatible to v2 or later. */
unsigned int extcap_v3:1; /* Extcap is in v3 format. */ unsigned int is_v3:1; /* Comatible to v3 or later. */
unsigned int has_button:1; /* Has confirmation button or not. */ unsigned int has_button:1; /* Has confirmation button or not. */
unsigned int sm_supported:1; /* Secure Messaging is supported. */ unsigned int sm_supported:1; /* Secure Messaging is supported. */
@ -206,7 +206,7 @@ struct app_local_s {
unsigned int sm_algo:2; /* Symmetric crypto algo for SM. */ unsigned int sm_algo:2; /* Symmetric crypto algo for SM. */
unsigned int pin_blk2:1; /* PIN block 2 format supported. */ unsigned int pin_blk2:1; /* PIN block 2 format supported. */
unsigned int mse:1; /* MSE command supported. */ unsigned int mse:1; /* MSE command supported. */
unsigned int max_certlen_3:16; unsigned int max_certlen:16; /* Maximum size of DO 7F21. */
unsigned int max_get_challenge:16; /* Maximum size for get_challenge. */ unsigned int max_get_challenge:16; /* Maximum size for get_challenge. */
unsigned int max_special_do:16; /* Maximum size for special DOs. */ unsigned int max_special_do:16; /* Maximum size for special DOs. */
} extcap; } extcap;
@ -436,8 +436,8 @@ get_cached_data (app_t app, int tag,
if (try_extlen && app->app_local->cardcap.ext_lc_le) if (try_extlen && app->app_local->cardcap.ext_lc_le)
{ {
if (try_extlen == 1) if (try_extlen == 1)
exmode = app->app_local->extcap.max_certlen_3; exmode = app->app_local->extcap.max_certlen;
else if (try_extlen == 2 && app->app_local->extcap.extcap_v3) else if (try_extlen == 2 && app->app_local->extcap.is_v3)
exmode = app->app_local->extcap.max_special_do; exmode = app->app_local->extcap.max_special_do;
else else
exmode = 0; exmode = 0;
@ -1149,6 +1149,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
{ {
char tmp[110]; char tmp[110];
/* Noet that with v3 cards mcl3 is used for all certificates. */
snprintf (tmp, sizeof tmp, snprintf (tmp, sizeof tmp,
"gc=%d ki=%d fc=%d pd=%d mcl3=%u aac=%d " "gc=%d ki=%d fc=%d pd=%d mcl3=%u aac=%d "
"sm=%d si=%u dec=%d bt=%d kdf=%d", "sm=%d si=%u dec=%d bt=%d kdf=%d",
@ -1156,7 +1157,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
app->app_local->extcap.key_import, app->app_local->extcap.key_import,
app->app_local->extcap.change_force_chv, app->app_local->extcap.change_force_chv,
app->app_local->extcap.private_dos, app->app_local->extcap.private_dos,
app->app_local->extcap.max_certlen_3, app->app_local->extcap.max_certlen,
app->app_local->extcap.algo_attr_change, app->app_local->extcap.algo_attr_change,
(app->app_local->extcap.sm_supported (app->app_local->extcap.sm_supported
? (app->app_local->extcap.sm_algo == 0? CIPHER_ALGO_3DES : ? (app->app_local->extcap.sm_algo == 0? CIPHER_ALGO_3DES :
@ -3108,7 +3109,7 @@ do_writecert (app_t app, ctrl_t ctrl,
return gpg_error (GPG_ERR_INV_ARG); return gpg_error (GPG_ERR_INV_ARG);
if (!app->app_local->extcap.is_v2) if (!app->app_local->extcap.is_v2)
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
if (certdatalen > app->app_local->extcap.max_certlen_3) if (certdatalen > app->app_local->extcap.max_certlen)
return gpg_error (GPG_ERR_TOO_LARGE); return gpg_error (GPG_ERR_TOO_LARGE);
return do_setattr (app, ctrl, "CERT-3", pincb, pincb_arg, return do_setattr (app, ctrl, "CERT-3", pincb, pincb_arg,
certdata, certdatalen); certdata, certdatalen);
@ -5764,7 +5765,7 @@ static void
show_caps (struct app_local_s *s) show_caps (struct app_local_s *s)
{ {
log_info ("Version-2+ .....: %s\n", s->extcap.is_v2? "yes":"no"); log_info ("Version-2+ .....: %s\n", s->extcap.is_v2? "yes":"no");
log_info ("Extcap-v3 ......: %s\n", s->extcap.extcap_v3? "yes":"no"); log_info ("Version-3+ .....: %s\n", s->extcap.is_v3? "yes":"no");
log_info ("Button .........: %s\n", s->extcap.has_button? "yes":"no"); log_info ("Button .........: %s\n", s->extcap.has_button? "yes":"no");
log_info ("SM-Support .....: %s", s->extcap.sm_supported? "yes":"no"); log_info ("SM-Support .....: %s", s->extcap.sm_supported? "yes":"no");
@ -5780,8 +5781,8 @@ show_caps (struct app_local_s *s)
log_info ("Algo-Attr-Change: %s\n", s->extcap.algo_attr_change? "yes":"no"); log_info ("Algo-Attr-Change: %s\n", s->extcap.algo_attr_change? "yes":"no");
log_info ("Symmetric Crypto: %s\n", s->extcap.has_decrypt? "yes":"no"); log_info ("Symmetric Crypto: %s\n", s->extcap.has_decrypt? "yes":"no");
log_info ("KDF-Support ....: %s\n", s->extcap.kdf_do? "yes":"no"); log_info ("KDF-Support ....: %s\n", s->extcap.kdf_do? "yes":"no");
log_info ("Max-Cert3-Len ..: %u\n", s->extcap.max_certlen_3); log_info ("Max-Cert-Len ...: %u\n", s->extcap.max_certlen);
if (s->extcap.extcap_v3) if (s->extcap.is_v3)
{ {
log_info ("PIN-Block-2 ....: %s\n", s->extcap.pin_blk2? "yes":"no"); log_info ("PIN-Block-2 ....: %s\n", s->extcap.pin_blk2? "yes":"no");
log_info ("MSE-Support ....: %s\n", s->extcap.mse? "yes":"no"); log_info ("MSE-Support ....: %s\n", s->extcap.mse? "yes":"no");
@ -6155,7 +6156,7 @@ app_select_openpgp (app_t app)
app->app_local->extcap.is_v2 = 1; app->app_local->extcap.is_v2 = 1;
if (app->appversion >= 0x0300) if (app->appversion >= 0x0300)
app->app_local->extcap.extcap_v3 = 1; app->app_local->extcap.is_v3 = 1;
/* Read the historical bytes. */ /* Read the historical bytes. */
relptr = get_one_do (app, 0x5f52, &buffer, &buflen, NULL); relptr = get_one_do (app, 0x5f52, &buffer, &buflen, NULL);
@ -6206,10 +6207,10 @@ app_select_openpgp (app_t app)
app->app_local->extcap.sm_algo = buffer[1]; app->app_local->extcap.sm_algo = buffer[1];
app->app_local->extcap.max_get_challenge app->app_local->extcap.max_get_challenge
= (buffer[2] << 8 | buffer[3]); = (buffer[2] << 8 | buffer[3]);
app->app_local->extcap.max_certlen_3 = (buffer[4] << 8 | buffer[5]); app->app_local->extcap.max_certlen = (buffer[4] << 8 | buffer[5]);
/* Interpretation is different between v2 and v3, unfortunately. */ /* Interpretation is different between v2 and v3, unfortunately. */
if (app->app_local->extcap.extcap_v3) if (app->app_local->extcap.is_v3)
{ {
app->app_local->extcap.max_special_do app->app_local->extcap.max_special_do
= (buffer[6] << 8 | buffer[7]); = (buffer[6] << 8 | buffer[7]);