diff options
| author | Werner Koch <wk@gnupg.org> | 2022-10-24 17:40:20 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2022-10-25 11:57:23 +0200 |
| commit | 8361e13ef212f5be35b613084916b5ebad2714c6 (patch) | |
| tree | 031f726cd97f6734b863be36b8a9c5c0f25555c2 | |
| parent | gpgsm: Allow ECC encryption keys with just keyAgreement specified. (diff) | |
| download | gnupg2-8361e13ef212f5be35b613084916b5ebad2714c6.tar.xz gnupg2-8361e13ef212f5be35b613084916b5ebad2714c6.zip | |
scd:nks: Support non-ESIGN signing with the Signature Card v2
* scd/app-nks.c (do_sign): Handle ECC for NKS cards
| -rw-r--r-- | scd/app-nks.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/scd/app-nks.c b/scd/app-nks.c index 468c99c3f..68a4148ea 100644 --- a/scd/app-nks.c +++ b/scd/app-nks.c @@ -1898,19 +1898,31 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo, return gpg_error (GPG_ERR_INV_VALUE); #undef X - /* Send an MSE for PSO:Computer_Signature. */ + /* Send an MSE for PSO:Compute_Signature. */ if (app->appversion > 2 && app->app_local->active_nks_app != NKS_APP_ESIGN) { unsigned char mse[6]; + unsigned int mselen; - mse[0] = 0x80; /* Algorithm reference. */ - mse[1] = 1; - mse[2] = 2; /* RSA, card does pkcs#1 v1.5 padding, no ASN.1 check. */ - mse[3] = 0x84; /* Private key reference. */ - mse[4] = 1; - mse[5] = kid; + if (algo == GCRY_PK_ECC) + { + mse[0] = 0x84; /* Private key reference. */ + mse[1] = 1; + mse[2] = kid; + mselen = 3; + } + else /* RSA */ + { + mse[0] = 0x80; /* Algorithm reference. */ + mse[1] = 1; + mse[2] = 2; /* Card does pkcs#1 v1.5 padding, no ASN.1 check. */ + mse[3] = 0x84; /* Private key reference. */ + mse[4] = 1; + mse[5] = kid; + mselen = 6; + } err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB6, - mse, sizeof mse); + mse, mselen); } if (app->app_local->active_nks_app == NKS_APP_ESIGN) |