Skip to content

#5988 Replace "pass phrase" with "passphrase" #5992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2025
Merged

#5988 Replace "pass phrase" with "passphrase" #5992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02cade9
replaced "pass phrase" with "passphrase"
clickagree May 11, 2025
bb70b1d
Merge branch 'master' into passphrase-typo-fix
sosnovsky May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions extension/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ version 8.1.3 on July 31, 2021: <a href="https://github.com/FlowCrypt/flowcrypt-

version 8.1.2 on July 20, 2021: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/440?closed=1" target="_blank">Enterprise EIS</a>

version 8.1.1 on June 29, 2021: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/439?closed=1" target="_blank">EKM setup with pass phrase</a>
version 8.1.1 on June 29, 2021: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/439?closed=1" target="_blank">EKM setup with passphrase</a>

version 8.1.0 on June 9, 2021: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/438?closed=1" target="_blank">Fix settings layout</a>

Expand Down Expand Up @@ -114,7 +114,7 @@ version 7.9.8 on Oct 29, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-b

version 7.9.7 on Oct 20, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/426?closed=1" target="_blank">Custom SKS fix</a>

version 7.9.6 on Oct 19, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/425?closed=1" target="_blank">Preview attachments pass phrase</a>
version 7.9.6 on Oct 19, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/425?closed=1" target="_blank">Preview attachments passphrase</a>

version 7.9.5 on Oct 19, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/424?closed=1" target="_blank">Wkd Advanced Lookup, UTF files</a>

Expand Down Expand Up @@ -186,7 +186,7 @@ version 7.5.9 on Feb 1, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-br

version 7.5.8 on Jan 16, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/386?closed=1" target="_blank">Fix pwd msg online reply</a>

version 7.5.5 on Jan 9, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/385?closed=1" target="_blank">Default don't remember pass phrase</a>
version 7.5.5 on Jan 9, 2020: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/385?closed=1" target="_blank">Default don't remember passphrase</a>

version 7.5.4 on Dec 27, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/384?closed=1" target="_blank">Support ISO-2022-JP</a>

Expand Down Expand Up @@ -236,7 +236,7 @@ version 7.0.7 on Nov 5, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-br

version 7.0.6 on Oct 20, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/359?closed=1" target="_blank">Contact search bugfix</a>

version 7.0.5 on Oct 18, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/358?closed=1" target="_blank">Write pass phrase down</a>
version 7.0.5 on Oct 18, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/358?closed=1" target="_blank">Write passphrase down</a>

version 7.0.4 on Oct 10, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/357?closed=1" target="_blank">Fix sendAs migration</a>

Expand Down Expand Up @@ -310,7 +310,7 @@ version 6.7.0 on March 23, 2019: <a href="https://github.com/FlowCrypt/flowcrypt

version 6.6.9 on March 11, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/321?closed=1" target="_blank">Minimize compose window</a>

version 6.6.8 on March 7, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/320?closed=1" target="_blank">Fix decrypt files with session pass phrase</a>
version 6.6.8 on March 7, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/320?closed=1" target="_blank">Fix decrypt files with session passphrase</a>

version 6.6.7 on March 2, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/319?closed=1" target="_blank">Bugfixes</a>

Expand Down Expand Up @@ -346,7 +346,7 @@ version 6.5.2 on January 6, 2019: <a href="https://github.com/FlowCrypt/flowcryp

version 6.5.1 on January 6, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/303?closed=1" target="_blank">Unicode fix</a>

version 6.5.0 on January 4, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/302?closed=1" target="_blank">Fix pass phrase change dialog</a>
version 6.5.0 on January 4, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/302?closed=1" target="_blank">Fix passphrase change dialog</a>

version 6.4.9 on January 2, 2019: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/301?closed=1" target="_blank">Error handling</a>

Expand Down Expand Up @@ -462,7 +462,7 @@ version 5.9.0 on August 7, 2018: <a href="https://github.com/FlowCrypt/flowcrypt

version 5.8.9 on August 6, 2018: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/244?closed=1" target="_blank">Attestation fix</a>

version 5.8.8 on August 6, 2018: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/243?closed=1" target="_blank">Pass phrase prompt</a>
version 5.8.8 on August 6, 2018: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/243?closed=1" target="_blank">Passphrase prompt</a>

version 5.8.7 on August 5, 2018: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/242?closed=1" target="_blank">Key decrypted error</a>

Expand Down Expand Up @@ -596,7 +596,7 @@ internal: allow extension to work when block 3rd party cookies enabled
internal: library upgrades, bugfixes and other maintenance

version 5.2.7 on February 19, 2018: Session
reading: fixed decrypting when pass phrase is in session
reading: fixed decrypting when passphrase is in session

version 5.2.6 on February 19, 2018: Unicode
reading: fixed Russian and Chinese UTF from facebook
Expand All @@ -622,7 +622,7 @@ tests: improve automated tests

version 5.2.0 on February 11, 2018: Security
security: double check passphrase strength when trying to back up imported key security
settings: rename to "test my pass phrase"
settings: rename to "test my passphrase"
reading: support eM client compatibility

version 5.1.9 on January 31, 2018: Public key management
Expand Down Expand Up @@ -745,7 +745,7 @@ internal: fix key array migration missing key
internal: update openpgp.js

version 4.3.5 on July 21, 2017: Migration fix
internal: getting pass phrase during migrations fixed
internal: getting passphrase during migrations fixed

version 4.3.4 on July 20, 2017: Attest fix
setup: fixing attest element
Expand Down Expand Up @@ -799,7 +799,7 @@ internal: better reporting of unhandled promise errors
internal: prepare comose.js for desktop
internal: libsync from desktop
internal: consolidate new_message and reply_message into one template refactor
settings: Repeat password -> Repeat pass phrase placeholder backup
settings: Repeat password -> Repeat passphrase placeholder backup
reading: fix formatting of password messages

version 4.2.1 on June 25, 2017: Bugfixes
Expand Down Expand Up @@ -846,7 +846,7 @@ composing: drag and drop attachments
reading: recognize public keys sent as inner attachment of pgp message
reading: recognize pubkeys inside encrypted messages
reading: Compatibility issues with encrypted.asc
reading: enter pass phrase misbehaved with "show original message"
reading: enter passphrase misbehaved with "show original message"
reading: "Forget passphrase when I close chrome" in firefox fixed
setup: fix wording after setup done

Expand Down Expand Up @@ -970,7 +970,7 @@ internal: document.body.append is not a function bug
version 3.9.0 on March 30, 2017: Experimental Client
settings: alternative email client
reading: improve MIME support
setup: mention in backup email that it's protected by pass phrase
setup: mention in backup email that it's protected by passphrase

version 3.8.9 on March 28, 2017: Fix xss
security: fix xss issue outside of pgp blocks
Expand Down Expand Up @@ -1151,7 +1151,7 @@ design: changed size of profile image on setup

version 3.4.1 on February 19, 2017: User Friendly
reading: badly displayed verification message result
reading: correct pass phrase will get rejected when opening email
reading: correct passphrase will get rejected when opening email
reading: FlowCrypt failing to render decrypted messages
reading: google auth keeps reappearing on spotty internet
reading: switch-to-encrypted and show-original buttons improved
Expand Down Expand Up @@ -1379,7 +1379,7 @@ reading: fixed issue with very large messages + more efficient
reading: better message decrypting behavior on update or uninstall
setup: checking public key fingerprints on keyserver
setup: fixed bug in internal plugin messaging during setup
setup: evaluating pass phrase strength error fix
setup: evaluating passphrase strength error fix

version 2.8.4 on December 29, 2016: Improved Message Detection
reading: more robust and faster pgp block replacing
Expand All @@ -1403,7 +1403,7 @@ setup: Public Key Server page blank screen fix
setup: updated chrome content settings instructions
setup: uninstall stats
setup: uncaught exceptions handling
reading: fixed broken pass phrase dialog
reading: fixed broken passphrase dialog
reading: improved compatibility with PGP/MIME
composing: stopped repeated 404 errors when missing a draft

Expand All @@ -1428,8 +1428,8 @@ setup: increased minimal passphrase strength
setup: fixed broken pubkey submitting on keyservers page
setup: fixed broken checkboxes on manual setup page

version 2.5.6 on December 14, 2016: Pass phrase change
setup: create a new backup on pass phrase change
version 2.5.6 on December 14, 2016: Passphrase change
setup: create a new backup on passphrase change
setup: smoother plugin update: prompt to refresh gmail
composing: opened compose window won't close - bugfix

Expand Down Expand Up @@ -1479,7 +1479,7 @@ composing: first time users send button freeze fix

version 2.4.0 on November 22, 2016: human feedback
setup: guide user to send their first email
setup: explain what is pass phrase for
setup: explain what is passphrase for
setup: suggest to refresh gmail window after installation
setup: explain what is backup email for
setup: centering loading symbol
Expand Down Expand Up @@ -1570,13 +1570,13 @@ setup: don't rely on English language

version 1.8.0 on April 17, 2016: Drafts
composing: encrypted drafts functionality
setup: remember pass phrase and submit pubkey by default for new keys
setup: remember passphrase and submit pubkey by default for new keys

version 1.7.0 on April 14, 2016: Contacts
composing: search google contacts in new messge and reply box
composing: add all recipients on group reply
composing: change any recipient on reply
setup: changing pass phrase
setup: changing passphrase

version 1.6.0 on April 11, 2016: Public key management
setup: see and manage list of pubkeys
Expand All @@ -1587,14 +1587,14 @@ composing: contacts search is case insensitive
reading: load pgp pubkey blocs into pubkey cache

version 1.5.0 on April 9, 2016: Private key best practices and backups
reading: better pass phrase dialog
reading: better passphrase dialog
security: more and clearer setup and backup options
security: pass phrase strength bar + examples
security: passphrase strength bar + examples
security: better always encrypting private key
replying: triple recipient bugfix
design: new logo

version 1.4.0 on Mar 27, 2016: Session based private key pass phrase
version 1.4.0 on Mar 27, 2016: Session based private key passphrase
security: manual setup has option to forget passphrase
security: session passphrase entering dialog
reading: attachment file icons
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/backup.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<body class="backup_neutral">
<div id="backup_block" class="backup">
<div class="line">
This backup is protected by your pass phrase. Please make sure to note your pass phrase down or you may lose access to your encrypted emails!
This backup is protected by your passphrase. Please make sure to note your passphrase down or you may lose access to your encrypted emails!
</div>
<div class="line">
<input class="input_pass_phrase" type="password" id="pass_phrase" placeholder="Enter your pass phrase..." maxlength="256" />
<input class="input_pass_phrase" type="password" id="pass_phrase" placeholder="Enter your passphrase..." maxlength="256" />
<button class="button green action_test_pass">Test your Passphrase</button>
</div>
<div class="line fingerprints hide_if_compact">Key Fingerprint: <span class="fingerprint good"></span></div>
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/backup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ View.run(

private testPassphraseHandler = async () => {
if (await KeyUtil.checkPassPhrase(this.armoredPrvBackup, String($('#pass_phrase').val()))) {
await Ui.modal.info('Success - your pass phrase matches this backup!');
await Ui.modal.info('Success - your passphrase matches this backup!');
} else {
await Ui.modal.warning(
"Pass phrase did not match. Please try again. If you forgot your pass phrase, please change it, so that you don't get" +
"Passphrase did not match. Please try again. If you forgot your passphrase, please change it, so that you don't get" +
' locked out of your encrypted messages.'
);
}
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/compose-modules/compose-draft-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ export class ComposeDraftModule extends ViewModule<ComposeView> {
Xss.sanitizeRender(
this.view.S.cached('prompt'),
`
<div style="font-size: 18px">Waiting for pass phrase to open draft...</div>
<div style="font-size: 18px">Waiting for passphrase to open draft...</div>
<div class="mt-20">
<button href="#" data-test="action-open-passphrase-dialog" class="button long green action_open_passphrase_dialog">Enter pass phrase</button>
<button href="#" data-test="action-open-passphrase-dialog" class="button long green action_open_passphrase_dialog">Enter passphrase</button>
<button href="#" class="button gray action_close">close</button>
</div>
`
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-err-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class ComposeErrModule extends ViewModule<ComposeView> {
if (pwd) {
if (await this.view.storageModule.isPwdMatchingPassphrase(pwd)) {
throw new ComposerUserError(
'Please do not use your private key pass phrase as a password for this message.\n\n' +
'Please do not use your private key passphrase as a password for this message.\n\n' +
'You should come up with some other unique password that you can share with recipient.'
);
}
Expand Down
6 changes: 3 additions & 3 deletions extension/chrome/elements/compose-modules/compose-storage-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export class ComposeStorageModule extends ViewModule<ComposeView> {
};

/**
* returns decrypted key (potentially using user-entered pass phrase)
* otherwise throws ComposerResetBtnTrigger when pass phrase not entered
* returns decrypted key (potentially using user-entered passphrase)
* otherwise throws ComposerResetBtnTrigger when passphrase not entered
*/
public decryptSenderKey = async (parsedKey: ParsedKeyInfo): Promise<ParsedKeyInfo> => {
const passphrase = await this.passphraseGet(parsedKey.keyInfo);
Expand All @@ -92,7 +92,7 @@ export class ComposeStorageModule extends ViewModule<ComposeView> {
return await this.decryptSenderKey(parsedKey);
} else {
// reset - no passphrase entered
throw new ComposerResetBtnTrigger('no pass phrase entered');
throw new ComposerResetBtnTrigger('no passphrase entered');
}
} else {
if (!parsedKey.key.fullyDecrypted) {
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/formatters/general-mail-formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class GeneralMailFormatter {
if (!parsedSenderPrv) {
return undefined;
}
// throws ComposerResetBtnTrigger when user closes pass phrase dialog without entering
// throws ComposerResetBtnTrigger when user closes passphrase dialog without entering
return await view.storageModule.decryptSenderKey(parsedSenderPrv);
}

Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/passphrase.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ <h1 class="passphrase_text" data-test="passphrase-text"></h1>
</div>
<div class="separator" style="margin-top: 85px"></div>
<a href id="lost-pass-phrase"
><div class="lost-pass-phrase display_none" data-test="lost-pass-phrase">Lost pass phrase?</div>
><div class="lost-pass-phrase display_none" data-test="lost-pass-phrase">Lost passphrase?</div>
<div class="lost-pass-phrase-with-ekm display_none" data-test="lost-pass-phrase-with-ekm">
Ask your IT staff for help if you lost your pass phrase.
Ask your IT staff for help if you lost your passphrase.
</div></a
>
</div>
Expand Down
10 changes: 5 additions & 5 deletions extension/chrome/elements/passphrase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ View.run(
if (this.keysWeNeedPassPhraseFor.length === 1) {
html = `For key Fingerprint: <span class="good">${Xss.escape(Str.spaced(this.keysWeNeedPassPhraseFor[0].fingerprints[0] || ''))}</span>`;
} else {
html = 'Pass phrase needed for any of the following keys:';
html = 'Passphrase needed for any of the following keys:';
for (const i of this.keysWeNeedPassPhraseFor.keys()) {
html += `<div>Fingerprint ${String(i + 1)}: <span class="good">${Xss.escape(
Str.spaced(this.keysWeNeedPassPhraseFor[i].fingerprints[0]) || ''
Expand Down Expand Up @@ -146,12 +146,12 @@ View.run(
<code>Change Pass Phrase</code>.<br>
It will let you change it without knowing the previous one. When done,
<a href class="reset-flowcrypt">reset FlowCrypt on this device</a>
and use the new pass phrase during the recovery step when
and use the new passphrase during the recovery step when
you set up FlowCrypt on this device again.
<p><strong>If no:</strong> unfortunately, you will not be able to read
previously encrypted emails regardless of what you do.
You can <a href class="reset-flowcrypt">reset FlowCrypt on this device</a>
and then click <code>Lost your pass phrase?</code> during recovery step.
and then click <code>Lost your passphrase?</code> during recovery step.
</div>
`,
true
Expand Down Expand Up @@ -227,7 +227,7 @@ View.run(
let unlockCount = 0; // may include non-matching keys
const allPrivateKeys = await KeyStore.get(this.acctEmail);
for (const keyinfo of allPrivateKeys) {
// if passphrase matches more keys, it will save the pass phrase for all keys
// if passphrase matches more keys, it will save the passphrase for all keys
const prv = await KeyUtil.parse(keyinfo.private);
try {
if (await KeyUtil.decrypt(prv, pass)) {
Expand All @@ -252,7 +252,7 @@ View.run(
}
}
if (unlockCount && allPrivateKeys.length > 1) {
Ui.toast(`${unlockCount} of ${allPrivateKeys.length} keys ${unlockCount > 1 ? 'were' : 'was'} unlocked by this pass phrase`);
Ui.toast(`${unlockCount} of ${allPrivateKeys.length} keys ${unlockCount > 1 ? 'were' : 'was'} unlocked by this passphrase`);
await this.closeDialogPageOpenedExternally();
}
if (atLeastOneMatched) {
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class PgpBlockViewRenderModule {

public renderPassphraseNeeded = (longids: string[]) => {
const enterPp = `<a href="#" class="enter_passphrase" data-test="action-show-passphrase-dialog">${Lang.pgpBlock.enterPassphrase}</a> ${Lang.pgpBlock.toOpenMsg}`;
this.view.errorModule.renderErr(enterPp, undefined, 'pass phrase needed');
this.view.errorModule.renderErr(enterPp, undefined, 'passphrase needed');
$('.enter_passphrase').on(
'click',
this.view.setHandler(() => {
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/shared/backup.template.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</div>
<div>
<p>
Back up private key in your Gmail Inbox. The security depends on the strength of your pass phrase, which should be very long and hard to guess.
Back up private key in your Gmail Inbox. The security depends on the strength of your passphrase, which should be very long and hard to guess.
Best option for most users.
</p>
</div>
Expand All @@ -72,7 +72,7 @@
</div>
<div>
<p>
Manage the backup file yourself. To prevent data loss, you will need this file and your pass phrase if you ever lose your device or it stops
Manage the backup file yourself. To prevent data loss, you will need this file and your passphrase if you ever lose your device or it stops
working.
</p>
</div>
Expand Down
Loading
Loading