Skip to content

Commit

Permalink
fix typo: Yubikey->YubiKey
Browse files Browse the repository at this point in the history
Signed-off-by: Trishank Karthik Kuppusamy <[email protected]>
  • Loading branch information
trishankatdatadog committed Jul 11, 2020
1 parent ca7aa4b commit 206db04
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Keybase app, or uploading an encrypted copy of your private key. For example,
see this [profile](https://keybase.io/trishankdatadog).

If you have the [Keybase application](https://keybase.io/docs/the_app/install_macos)
installed, you can import your Yubikey public key like this:
installed, you can import your YubiKey public key like this:

```bash
$ keybase pgp select
Expand Down
10 changes: 5 additions & 5 deletions expect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ set EMAIL [lindex $argv 6];
set COMMENT [lindex $argv 7];

# Turn off OTP.
send_user "Turning off Yubikey OTP:\n"
send_user "Turning off YubiKey OTP:\n"
spawn ykman mode "FIDO+CCID"
expect {
"Mode is already FIDO+CCID, nothing to do..." {
Expand All @@ -70,7 +70,7 @@ expect {

# Turn on touch for SIGNATURES.

send_user "Now requiring you to touch your Yubikey to sign any message.\n"
send_user "Now requiring you to touch your YubiKey to sign any message.\n"
spawn ykman openpgp set-touch sig $TOUCH_POLICY

expect -exact "Enter admin PIN: "
Expand All @@ -83,7 +83,7 @@ expect eof

# Turn on touch for AUTHENTICATION.

send_user "Now requiring you to touch your Yubikey to authenticate SSH.\n"
send_user "Now requiring you to touch your YubiKey to authenticate SSH.\n"
spawn ykman openpgp set-touch aut $TOUCH_POLICY

expect -exact "Enter admin PIN: "
Expand All @@ -96,7 +96,7 @@ expect eof

# Turn on touch for ENCRYPTION.

send_user "Now requiring you to touch your Yubikey to encrypt any message.\n"
send_user "Now requiring you to touch your YubiKey to encrypt any message.\n"
spawn ykman openpgp set-touch enc $TOUCH_POLICY

expect -exact "Enter admin PIN: "
Expand All @@ -112,7 +112,7 @@ expect eof

# Set up PIN, PUK, and then generate keys on card.

send_user "Now generating your GPG keys on the Yubikey itself.\n"
send_user "Now generating your GPG keys on the YubiKey itself.\n"
spawn gpg --homedir=$GPG_HOMEDIR --card-edit

expect -exact "gpg/card> "
Expand Down
14 changes: 7 additions & 7 deletions gpg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Stop on error.
set -e

echo "Welcome! This program will automatically generate GPG keys on your Yubikey."
echo "Welcome! This program will automatically generate GPG keys on your YubiKey."
echo "If you ever run into problems, just press Ctrl-C, and rerun this program again."
echo

Expand All @@ -17,7 +17,7 @@ echo
source realname-and-email.sh

# Get comment to distinguish between keys.
COMMENT="GPG on Yubikey for Datadog"
COMMENT="GPG on YubiKey for Datadog"
echo "What is a comment you would like to use to distinguish this key?"
read -p "Comment (press Enter to accept '$COMMENT'): " input
COMMENT=${input:-$COMMENT}
Expand Down Expand Up @@ -52,7 +52,7 @@ echo

# Show card information to user so they can be sure they are wiping right key
# NOTE: explicitly check against default GPG homedir to make sure we are not wiping something critical...
echo "Yubikey status:"
echo "YubiKey status:"
$GPG --card-status
echo

Expand Down Expand Up @@ -108,7 +108,7 @@ EOF
# restart GPG daemons to pick up pinentry-mac
$GPGCONF --kill all

echo "There are two important random numbers for the Yubikey you MUST keep safely."
echo "There are two important random numbers for the YubiKey you MUST keep safely."
echo "See https://developers.yubico.com/yubikey-piv-manager/PIN_and_Management_Key.html"
echo

Expand Down Expand Up @@ -154,7 +154,7 @@ cat $ASC_GPG_PUBKEY | pbcopy
echo "Please save a copy in your password manager."
read -p "Have you done this? "
echo "There is NO off-card backup of your private / secret keys."
echo "So, if your Yubikey is damaged, lost, or stolen, then you must rotate your GPG keys out-of-band."
echo "So, if your YubiKey is damaged, lost, or stolen, then you must rotate your GPG keys out-of-band."
echo "You would also no longer be able to decrypt messages encrypted for this GPG key."
echo

Expand All @@ -173,10 +173,10 @@ echo

# Final reminders.
echo "Finally, remember that your keys will not expire until 10 years from now."
echo "You will need to ${RED}${BOLD}enter your PIN (once a day)${RESET}, and ${RED}${BOLD}touch your Yubikey every time${RESET} in order to sign any message with this GPG key."
echo "You will need to ${RED}${BOLD}enter your PIN (once a day)${RESET}, and ${RED}${BOLD}touch your YubiKey every time${RESET} in order to sign any message with this GPG key."
if [[ "$YUBIKEY_FIPS" == "true" ]]; then
echo "You may wish to pass the --no-gpg-sign flag to git rebase."
else
echo "Touch is cached for 15s on sign operations."
fi
echo "Enjoy using your Yubikey at Datadog!"
echo "Enjoy using your YubiKey at Datadog!"
4 changes: 2 additions & 2 deletions ssh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ echo "Please save a copy in your password manager."
read -p "Have you done this? "
echo "Great."
echo
echo "You will need to ${RED}${BOLD}enter your PIN (once a day)${RESET}, and ${RED}${BOLD}touch your Yubikey everytime${RESET} in order to use SSH."
echo "You will need to ${RED}${BOLD}enter your PIN (once a day)${RESET}, and ${RED}${BOLD}touch your YubiKey everytime${RESET} in order to use SSH."
echo
echo "Enjoy using your Yubikey at Datadog!"
echo "Enjoy using your YubiKey at Datadog!"

0 comments on commit 206db04

Please sign in to comment.