diff --git a/doc/age-keygen.1.html b/doc/age-keygen.1.html index 32e33bb8..39fe29ad 100644 --- a/doc/age-keygen.1.html +++ b/doc/age-keygen.1.html @@ -127,7 +127,7 @@

SEE ALSO

AUTHORS

-

Filippo Valsorda age@filippo.io

+

Filippo Valsorda age@filippo.io

    diff --git a/doc/age.1 b/doc/age.1 index c8e979bf..07566a4f 100644 --- a/doc/age.1 +++ b/doc/age.1 @@ -105,10 +105,13 @@ Decrypt using the \fIIDENTITIES\fR at \fIPATH\fR\. a\. A file listing \fIIDENTITIES\fR one per line\. Empty lines and lines starting with "\fB#\fR" are ignored as comments\. . .IP -b\. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format\. If the private key is password\-protected, the password is requested interactively only if the SSH identity matches the file\. See the \fISSH keys\fR section for more information, including supported key types\. +b\. A passphrase encrypted age file, containing \fIIDENTITIES\fR one per line like above\. The passphrase is requested interactively\. Note that passphrase\-protected identity files are not necessary for most use cases, where access to the encrypted identity file implies access to the whole system\. . .IP -c\. "\fB\-\fR", causing one of the options above to be read from standard input\. In this case, the \fIINPUT\fR argument must be specified\. +c\. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format\. If the private key is password\-protected, the password is requested interactively only if the SSH identity matches the file\. See the \fISSH keys\fR section for more information, including supported key types\. +. +.IP +d\. "\fB\-\fR", causing one of the options above to be read from standard input\. In this case, the \fIINPUT\fR argument must be specified\. . .IP This option can be repeated\. Identities are tried in the order in which are provided, and the first one matching one of the file\'s recipients is used\. Unused identities are ignored\. @@ -250,6 +253,27 @@ Enter passphrase: .IP "" 0 . .P +Encrypt and decrypt with a passphrase\-protected identity file: +. +.IP "" 4 +. +.nf + +$ age\-keygen | age \-p > key\.age +Public key: age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5 +Enter passphrase (leave empty to autogenerate a secure one): +Using the autogenerated passphrase "hip\-roast\-boring\-snake\-mention\-east\-wasp\-honey\-input\-actress"\. + +$ age \-r age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5 secrets\.txt > secrets\.txt\.age + +$ age \-d \-i key\.age secrets\.txt\.age > secrets\.txt +Enter passphrase for identity file "key\.age": +. +.fi +. +.IP "" 0 +. +.P Encrypt and decrypt with an SSH public key: . .IP "" 4 diff --git a/doc/age.1.html b/doc/age.1.html index 6e4dc272..badf706f 100644 --- a/doc/age.1.html +++ b/doc/age.1.html @@ -162,12 +162,18 @@

    Decryption options

    a. A file listing IDENTITIES one per line. Empty lines and lines starting with "#" are ignored as comments.

    -

    b. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format. +

    b. A passphrase encrypted age file, containing + IDENTITIES one per line like above. + The passphrase is requested interactively. Note that passphrase-protected + identity files are not necessary for most use cases, where access to the + encrypted identity file implies access to the whole system.

    + +

    c. An SSH private key file, in PKCS#1, PKCS#8, or OpenSSH format. If the private key is password-protected, the password is requested interactively only if the SSH identity matches the file. See the SSH keys section for more information, including supported key types.

    -

    c. "-", causing one of the options above to be read from standard input. +

    d. "-", causing one of the options above to be read from standard input. In this case, the INPUT argument must be specified.

    This option can be repeated. Identities are tried in the order in which @@ -276,6 +282,19 @@

    EXAMPLES

    Enter passphrase: +

    Encrypt and decrypt with a passphrase-protected identity file:

    + +
    $ age-keygen | age -p > key.age
    +Public key: age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5
    +Enter passphrase (leave empty to autogenerate a secure one):
    +Using the autogenerated passphrase "hip-roast-boring-snake-mention-east-wasp-honey-input-actress".
    +
    +$ age -r age1yhm4gctwfmrpz87tdslm550wrx6m79y9f2hdzt0lndjnehwj0ukqrjpyx5 secrets.txt > secrets.txt.age
    +
    +$ age -d -i key.age secrets.txt.age > secrets.txt
    +Enter passphrase for identity file "key.age":
    +
    +

    Encrypt and decrypt with an SSH public key:

    $ age -R ~/.ssh/id_ed25519.pub example.jpg > example.jpg.age
    @@ -294,7 +313,7 @@ 

    SEE ALSO

    AUTHORS

    -

    Filippo Valsorda age@filippo.io

    +

    Filippo Valsorda age@filippo.io