From 68e849315b23e210f4b92e31732d669287435909 Mon Sep 17 00:00:00 2001 From: Nicolas Pinto Date: Fri, 13 Jul 2018 16:25:52 +0000 Subject: [PATCH] Client: rename 'passphrase' into 'password' when encrypting keys --- src/lib_signer_backends/encrypted.ml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib_signer_backends/encrypted.ml b/src/lib_signer_backends/encrypted.ml index b70a637b5..789aa0f99 100644 --- a/src/lib_signer_backends/encrypted.ml +++ b/src/lib_signer_backends/encrypted.ml @@ -203,19 +203,19 @@ let decrypt_list (cctxt : #Client_context.io_wallet) keys = return_unit end sks -let rec read_passphrase (cctxt : #Client_context.io) = +let rec read_password (cctxt : #Client_context.io) = cctxt#prompt_password - "Enter passphrase to encrypt your key: " >>=? fun password -> + "Enter password to encrypt your key: " >>=? fun password -> cctxt#prompt_password - "Confirm passphrase: " >>=? fun confirm -> + "Confirm password: " >>=? fun confirm -> if not (MBytes.equal password confirm) then - cctxt#message "Passphrases do not match." >>= fun () -> - read_passphrase cctxt + cctxt#message "Passwords do not match." >>= fun () -> + read_password cctxt else return password let encrypt cctxt sk = - read_passphrase cctxt >>=? fun password -> + read_password cctxt >>=? fun password -> let payload = Raw.encrypt ~password sk in let encoding = match sk with | Ed25519 _ -> Encodings.ed25519 @@ -236,7 +236,7 @@ module Make(C : sig val cctxt: Client_context.prompter end) = struct let description = "Valid secret key URIs are of the form\n\ \ - encrypted:\n\ - where is the encrypted (passphrase protected \ + where is the encrypted (password protected \ using Nacl's cryptobox and pbkdf) secret key, formatted in \ unprefixed Base58.\n\ Valid public key URIs are of the form\n\