balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Client: rename 'passphrase' into 'password' when encrypting keys

Browse Source
This commit is contained in:
Nicolas Pinto 2018-07-13 16:25:52 +00:00 committed by Grégoire Henry
parent e642cb621d
commit 68e849315b
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib_signer_backends/encrypted.ml
View File

@ -203,19 +203,19 @@ let decrypt_list (cctxt : #Client_context.io_wallet) keys =
return_unit return_unit
end sks end sks
let rec read_passphrase (cctxt : #Client_context.io) = let rec read_password (cctxt : #Client_context.io) =
cctxt#prompt_password cctxt#prompt_password
"Enter passphrase to encrypt your key: " >>=? fun password -> "Enter password to encrypt your key: " >>=? fun password ->
cctxt#prompt_password cctxt#prompt_password
"Confirm passphrase: " >>=? fun confirm -> "Confirm password: " >>=? fun confirm ->
if not (MBytes.equal password confirm) then if not (MBytes.equal password confirm) then
cctxt#message "Passphrases do not match." >>= fun () -> cctxt#message "Passwords do not match." >>= fun () ->
read_passphrase cctxt read_password cctxt
else else
return password return password
let encrypt cctxt sk = let encrypt cctxt sk =
read_passphrase cctxt >>=? fun password -> read_password cctxt >>=? fun password ->
let payload = Raw.encrypt ~password sk in let payload = Raw.encrypt ~password sk in
let encoding = match sk with let encoding = match sk with
| Ed25519 _ -> Encodings.ed25519 | Ed25519 _ -> Encodings.ed25519
@ -236,7 +236,7 @@ module Make(C : sig val cctxt: Client_context.prompter end) = struct
let description = let description =
"Valid secret key URIs are of the form\n\ "Valid secret key URIs are of the form\n\
\ - encrypted:<encrypted_key>\n\ \ - encrypted:<encrypted_key>\n\
where <encrypted_key> is the encrypted (passphrase protected \ where <encrypted_key> is the encrypted (password protected \
using Nacl's cryptobox and pbkdf) secret key, formatted in \ using Nacl's cryptobox and pbkdf) secret key, formatted in \
unprefixed Base58.\n\ unprefixed Base58.\n\
Valid public key URIs are of the form\n\ Valid public key URIs are of the form\n\