diff --git a/README b/README index 72766b2..bf95820 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Introduction ------------ The Yubico PIV tool is used for interacting with the Privilege and -Identification Card (PIV) applet on a https://www.yubico.com[YubiKey NEO]. +Identification Card (PIV) application on a https://www.yubico.com[YubiKey NEO]. With it you may generate keys on the device, importing keys and certificates, and create certificate requests, and other operations. diff --git a/doc/Certificate_Authority_with_NEO.adoc b/doc/Certificate_Authority_with_NEO.adoc index b607b74..dd0687c 100644 --- a/doc/Certificate_Authority_with_NEO.adoc +++ b/doc/Certificate_Authority_with_NEO.adoc @@ -39,7 +39,7 @@ offline machine, booted from a LiveCD. Some additional packages may be required (pcscd, etc, see below) and will have to be transferred on a USB stick. -You need a YubiKey NEO with the PIV applet on, which you can purchase +You need a YubiKey NEO with the PIV application on, which you can purchase from Yubico. You need to install the PKCS#11 Engine: diff --git a/doc/OS_X_code_signing.adoc b/doc/OS_X_code_signing.adoc index 33d804f..3ccf833 100644 --- a/doc/OS_X_code_signing.adoc +++ b/doc/OS_X_code_signing.adoc @@ -8,7 +8,7 @@ certificate in the Neo and use it for code signing. Prerequisites ------------- -* a YubiKey Neo with the PIV applet loaded +* a YubiKey Neo with the PIV application loaded * the yubico-piv-tool software * the OpenSC software * membership in the mac developer program @@ -45,7 +45,7 @@ Steps + NOTE: -K DER is available from version 0.1.3, with earlier convert to PEM and import. -8. Set a new chuid in the applet to make sure nothing is cached for the key: +8. Set a new chuid in the application to make sure nothing is cached for the key: $ yubico-piv-tool -a set-chuid diff --git a/doc/SSH_with_PIV_and_PKCS11.adoc b/doc/SSH_with_PIV_and_PKCS11.adoc index 525c5d9..e2e2b69 100644 --- a/doc/SSH_with_PIV_and_PKCS11.adoc +++ b/doc/SSH_with_PIV_and_PKCS11.adoc @@ -8,7 +8,7 @@ Primarily on a OS X or Linux system. Prerequisites ------------- -* a YubiKey Neo with the PIV applet loaded +* a YubiKey Neo with the PIV application loaded * the yubico-piv-tool software * the OpenSC software * OpenSSH diff --git a/doc/Windows_certificate.adoc b/doc/Windows_certificate.adoc index f178c70..e7b7ea3 100644 --- a/doc/Windows_certificate.adoc +++ b/doc/Windows_certificate.adoc @@ -8,7 +8,7 @@ and then load the certificate in the Neo. Prerequisites ------------- -* a YubiKey Neo with the PIV applet loaded +* a YubiKey Neo with the PIV application loaded * the yubico-piv-tool software * credentials to request certs from a Windows CA diff --git a/doc/YubiKey_NEO_PIV_introduction.adoc b/doc/YubiKey_NEO_PIV_introduction.adoc index 51c8d4d..28863a7 100644 --- a/doc/YubiKey_NEO_PIV_introduction.adoc +++ b/doc/YubiKey_NEO_PIV_introduction.adoc @@ -1,5 +1,5 @@ -Introduction to the YubiKey NEO PIV Applet -========================================== +Introduction to the YubiKey NEO PIV Application +=============================================== The YubiKey NEO supports the Personal Identity Verification (PIV) card interface specified in NIST SP 800-73 document "Cryptographic @@ -33,7 +33,7 @@ Preparing a NEO for real use ---------------------------- You would typically change the management key to make sure nobody but -you can modify the state of the PIV applet on the NEO. Make sure to +you can modify the state of the PIV application on the NEO. Make sure to keep a copy of the key around for later use. key=`dd if=/dev/random bs=1 count=24 2>/dev/null | hexdump -v -e '/1 "%02X"'` @@ -63,7 +63,7 @@ To reset PIN/PUK retry counter AND codes (default pin 123456 puk yubico-piv-tool -k $key -a verify -P $pin -a pin-retries --pin-retries 3 --puk-retries 3 -To reset the applet (PIN/PUK need to be blocked hence trying a couple +To reset the application (PIN/PUK need to be blocked hence trying a couple of times -- you need to modify this if you have changed the default number of PIN/PUK retries). @@ -94,7 +94,7 @@ middleware. Card Holder Unique Identifier ----------------------------- -For the applet to be usable in windows the object CHUID (Card Holder +For the application to be usable in windows the object CHUID (Card Holder Unique Identifier) has to be set and unique. The card contents are also aggressively cached so the CHUID has to be changed if the card contents change. diff --git a/lib/error.c b/lib/error.c index ce2ac80..a812ed4 100644 --- a/lib/error.c +++ b/lib/error.c @@ -46,7 +46,7 @@ static const err_t errors[] = { ERR (YKPIV_MEMORY_ERROR, "Error allocating memory"), ERR (YKPIV_PCSC_ERROR, "Error in PCSC call"), ERR (YKPIV_SIZE_ERROR, "Wrong buffer size"), - ERR (YKPIV_APPLET_ERROR, "No PIV applet found"), + ERR (YKPIV_APPLET_ERROR, "No PIV application found"), ERR (YKPIV_AUTHENTICATION_ERROR, "Error during authentication"), ERR (YKPIV_RANDOMNESS_ERROR, "Error getting randomness"), ERR (YKPIV_GENERIC_ERROR, "Something went wrong."), diff --git a/lib/ykpiv.c b/lib/ykpiv.c index 538b632..0a8e830 100644 --- a/lib/ykpiv.c +++ b/lib/ykpiv.c @@ -184,7 +184,7 @@ ykpiv_rc ykpiv_connect(ykpiv_state *state, const char *wanted) { return YKPIV_OK; } else { if(state->verbose) { - fprintf(stderr, "Failed selecting applet: %04x\n", sw); + fprintf(stderr, "Failed selecting application: %04x\n", sw); } } } diff --git a/tool/yubico-piv-tool.adoc b/tool/yubico-piv-tool.adoc index e918907..cbe17e5 100644 --- a/tool/yubico-piv-tool.adoc +++ b/tool/yubico-piv-tool.adoc @@ -30,7 +30,7 @@ For more information about what's happening --verbose can be added to any command. For much more information --verbose=2 may be used. -Display what version of the applet is running on the YubiKey Neo: +Display what version of the application is running on the YubiKey Neo: yubico-piv-tool -a version diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c index b611340..01a6690 100644 --- a/tool/yubico-piv-tool.c +++ b/tool/yubico-piv-tool.c @@ -75,9 +75,9 @@ static void print_version(ykpiv_state *state, const char *output_file_name) { } if(ykpiv_get_version(state, version, sizeof(version)) == YKPIV_OK) { - fprintf(output_file, "Applet version %s found.\n", version); + fprintf(output_file, "Application version %s found.\n", version); } else { - fprintf(stderr, "Failed to retrieve applet version.\n"); + fprintf(stderr, "Failed to retrieve application version.\n"); } if(output_file != stdout) { @@ -993,7 +993,7 @@ static bool change_pin(ykpiv_state *state, enum enum_action action, const char * if(action == action_arg_changeMINUS_pin) { fprintf(stderr, "The pin code is blocked, use the unblock-pin action to unblock it.\n"); } else { - fprintf(stderr, "The puk code is blocked, you will have to reinitialize the applet.\n"); + fprintf(stderr, "The puk code is blocked, you will have to reinitialize the application.\n"); } } else { fprintf(stderr, "Failed changing/unblocking code, error: %x\n", sw); @@ -1723,11 +1723,11 @@ int main(int argc, char *argv[]) { } if(ykpiv_authenticate(state, key) != YKPIV_OK) { - fprintf(stderr, "Failed authentication with the applet.\n"); + fprintf(stderr, "Failed authentication with the application.\n"); return EXIT_FAILURE; } if(verbosity) { - fprintf(stderr, "Successful applet authentication.\n"); + fprintf(stderr, "Successful application authentication.\n"); } break; } @@ -1791,7 +1791,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "Reset failed, are pincodes blocked?\n"); ret = EXIT_FAILURE; } else { - fprintf(stderr, "Successfully reset the applet.\n"); + fprintf(stderr, "Successfully reset the application.\n"); } break; case action_arg_pinMINUS_retries: diff --git a/tool/yubico-piv-tool.h2m b/tool/yubico-piv-tool.h2m index eda9546..f4925fc 100644 --- a/tool/yubico-piv-tool.h2m +++ b/tool/yubico-piv-tool.h2m @@ -30,7 +30,7 @@ For more information about what's happening \-\-verbose can be added to any command. For much more information \-\-verbose=2 may be used. -Display what version of the applet is running on the YubiKey Neo: +Display what version of the application is running on the YubiKey Neo: yubico\-piv\-tool \-a version