diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-11-10 06:34:50 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-11-13 10:44:53 +0100 |
| commit | 5db6fbe1a5af0051471348d8bd2fe54aa9e0d124 (patch) | |
| tree | ad3ad4bd7d17c0c8989b73d59da0f768c2a4cc5f /src/pkcs11.c | |
| parent | 8f76ca84d8f1783ac02c78416d5be5e9facd958f (diff) | |
| download | gnutls-5db6fbe1a5af0051471348d8bd2fe54aa9e0d124.tar.gz | |
p11tool: added options to initialize a user and admin's PIN
Diffstat (limited to 'src/pkcs11.c')
| -rw-r--r-- | src/pkcs11.c | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/src/pkcs11.c b/src/pkcs11.c index 7334118252..6f028ed9d8 100644 --- a/src/pkcs11.c +++ b/src/pkcs11.c @@ -906,7 +906,7 @@ pkcs11_init(FILE * outfile, const char *url, const char *label, } else { pin = getenv("GNUTLS_PIN"); if (pin == NULL && info->batch == 0) - pin = getpass("Enter new User's PIN: "); + pin = getpass("Enter User's new PIN: "); if (pin == NULL) exit(1); } @@ -927,6 +927,56 @@ pkcs11_init(FILE * outfile, const char *url, const char *label, return; } +void +pkcs11_set_pin(FILE * outfile, const char *url, common_info_st * info, unsigned so) +{ + int ret; + const char *pin; + + pkcs11_common(info); + + if (url == NULL) { + fprintf(stderr, "error: no token URL given to initialize!\n"); + exit(1); + } + + fprintf(stderr, "Setting token's user PIN...\n"); + + if (so) { + if (info->so_pin != NULL) { + pin = info->so_pin; + } else { + pin = getenv("GNUTLS_SO_PIN"); + if (pin == NULL && info->batch == 0) + pin = getpass("Enter Administrators's new PIN: "); + if (pin == NULL) + exit(1); + } + } else { + if (info->pin != NULL) { + pin = info->pin; + } else { + pin = getenv("GNUTLS_PIN"); + if (pin == NULL && info->batch == 0) + pin = getpass("Enter User's new PIN: "); + if (pin == NULL) + exit(1); + } + } + + if (pin == NULL || pin[0] == '\n') + exit(1); + + ret = gnutls_pkcs11_token_set_pin(url, NULL, pin, (so!=0)?GNUTLS_PIN_SO:GNUTLS_PIN_USER); + if (ret < 0) { + fprintf(stderr, "Error in %s:%d: %s\n", __func__, __LINE__, + gnutls_strerror(ret)); + exit(1); + } + + return; +} + const char *mech_list[] = { [0] = "CKM_RSA_PKCS_KEY_PAIR_GEN", [1] = "CKM_RSA_PKCS", |