vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-16 12:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix #827 - passhprase typos

Browse Source
This commit is contained in:
Stephan Eicher
2019-08-13 01:35:18 +02:00
committed by Andrey Smirnov
parent 77d7c3871a
commit aa02c5cbe9
8 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/publish_repo.go
+2 -2
View File
@@ -37,8 +37,8 @@ Example:
cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release") cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)") cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)") cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
cmd.Flag.String("passphrase", "", "GPG passhprase for the key (warning: could be insecure)") cmd.Flag.String("passphrase", "", "GPG passphrase for the key (warning: could be insecure)")
cmd.Flag.String("passphrase-file", "", "GPG passhprase-file for the key (warning: could be insecure)") cmd.Flag.String("passphrase-file", "", "GPG passphrase-file for the key (warning: could be insecure)")
cmd.Flag.Bool("batch", false, "run GPG with detached tty") cmd.Flag.Bool("batch", false, "run GPG with detached tty")
cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG") cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes") cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes")
cmd/publish_snapshot.go
+2 -2
View File
@@ -221,8 +221,8 @@ Example:
cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release") cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)") cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)") cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
cmd.Flag.String("passphrase", "", "GPG passhprase for the key (warning: could be insecure)") cmd.Flag.String("passphrase", "", "GPG passphrase for the key (warning: could be insecure)")
cmd.Flag.String("passphrase-file", "", "GPG passhprase-file for the key (warning: could be insecure)") cmd.Flag.String("passphrase-file", "", "GPG passphrase-file for the key (warning: could be insecure)")
cmd.Flag.Bool("batch", false, "run GPG with detached tty") cmd.Flag.Bool("batch", false, "run GPG with detached tty")
cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG") cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes") cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes")
cmd/publish_switch.go
+2 -2
View File
@@ -147,8 +147,8 @@ This command would switch published repository (with one component) named ppa/wh
cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release") cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)") cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)") cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
cmd.Flag.String("passphrase", "", "GPG passhprase for the key (warning: could be insecure)") cmd.Flag.String("passphrase", "", "GPG passphrase for the key (warning: could be insecure)")
cmd.Flag.String("passphrase-file", "", "GPG passhprase-file for the key (warning: could be insecure)") cmd.Flag.String("passphrase-file", "", "GPG passphrase-file for the key (warning: could be insecure)")
cmd.Flag.Bool("batch", false, "run GPG with detached tty") cmd.Flag.Bool("batch", false, "run GPG with detached tty")
cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG") cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes") cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes")
cmd/publish_update.go
+2 -2
View File
@@ -106,8 +106,8 @@ Example:
cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release") cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)") cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)") cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
cmd.Flag.String("passphrase", "", "GPG passhprase for the key (warning: could be insecure)") cmd.Flag.String("passphrase", "", "GPG passphrase for the key (warning: could be insecure)")
cmd.Flag.String("passphrase-file", "", "GPG passhprase-file for the key (warning: could be insecure)") cmd.Flag.String("passphrase-file", "", "GPG passphrase-file for the key (warning: could be insecure)")
cmd.Flag.Bool("batch", false, "run GPG with detached tty") cmd.Flag.Bool("batch", false, "run GPG with detached tty")
cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG") cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes") cmd.Flag.Bool("skip-contents", false, "don't generate Contents indexes")
completion.d/_aptly
+2 -2
View File
@@ -439,8 +439,8 @@ local keyring="*-keyring=[gpg keyring to use when verifying Release file (could
"-force-overwrite=[overwrite files in package pool in case of mismatch]:$bool" "-force-overwrite=[overwrite files in package pool in case of mismatch]:$bool"
"-gpg-key=[GPG key ID to use when signing the release]:gpg key id:$gpg_keys" "-gpg-key=[GPG key ID to use when signing the release]:gpg key id:$gpg_keys"
"-keyring=[GPG keyring to use (instead of default)]:keyring file:_files -g '*.gpg'" "-keyring=[GPG keyring to use (instead of default)]:keyring file:_files -g '*.gpg'"
"-passphrase=[GPG passhprase for the key (warning: could be insecure)]:passphrase: " "-passphrase=[GPG passphrase for the key (warning: could be insecure)]:passphrase: "
"-passphrase-file=[GPG passhprase−file for the key (warning: could be insecure)]:passphrase file:_files" "-passphrase-file=[GPG passphrase−file for the key (warning: could be insecure)]:passphrase file:_files"
"-secret-keyring=[GPG secret keyring to use (instead of default)]:secret-keyring:_files" "-secret-keyring=[GPG secret keyring to use (instead of default)]:secret-keyring:_files"
"-skip-contents=[don’t generate Contents indexes]:$bool" "-skip-contents=[don’t generate Contents indexes]:$bool"
"-skip-signing=[don’t sign Release files with GPG]:$bool" "-skip-signing=[don’t sign Release files with GPG]:$bool"
man/aptly.1
+8 -9
View File
@@ -1431,11 +1431,11 @@ origin name to publish
. .
.TP .TP
\-\fBpassphrase\fR= \-\fBpassphrase\fR=
GPG passhprase for the key (warning: could be insecure) GPG passphrase for the key (warning: could be insecure)
. .
.TP .TP
\-\fBpassphrase\-file\fR= \-\fBpassphrase\-file\fR=
GPG passhprase\-file for the key (warning: could be insecure) GPG passphrase\-file for the key (warning: could be insecure)
. .
.TP .TP
\-\fBsecret\-keyring\fR= \-\fBsecret\-keyring\fR=
@@ -1530,11 +1530,11 @@ overwrite origin name to publish
. .
.TP .TP
\-\fBpassphrase\fR= \-\fBpassphrase\fR=
GPG passhprase for the key (warning: could be insecure) GPG passphrase for the key (warning: could be insecure)
. .
.TP .TP
\-\fBpassphrase\-file\fR= \-\fBpassphrase\-file\fR=
GPG passhprase\-file for the key (warning: could be insecure) GPG passphrase\-file for the key (warning: could be insecure)
. .
.TP .TP
\-\fBsecret\-keyring\fR= \-\fBsecret\-keyring\fR=
@@ -1608,11 +1608,11 @@ GPG keyring to use (instead of default)
. .
.TP .TP
\-\fBpassphrase\fR= \-\fBpassphrase\fR=
GPG passhprase for the key (warning: could be insecure) GPG passphrase for the key (warning: could be insecure)
. .
.TP .TP
\-\fBpassphrase\-file\fR= \-\fBpassphrase\-file\fR=
GPG passhprase\-file for the key (warning: could be insecure) GPG passphrase\-file for the key (warning: could be insecure)
. .
.TP .TP
\-\fBsecret\-keyring\fR= \-\fBsecret\-keyring\fR=
@@ -1673,11 +1673,11 @@ GPG keyring to use (instead of default)
. .
.TP .TP
\-\fBpassphrase\fR= \-\fBpassphrase\fR=
GPG passhprase for the key (warning: could be insecure) GPG passphrase for the key (warning: could be insecure)
. .
.TP .TP
\-\fBpassphrase\-file\fR= \-\fBpassphrase\-file\fR=
GPG passhprase\-file for the key (warning: could be insecure) GPG passphrase\-file for the key (warning: could be insecure)
. .
.TP .TP
\-\fBsecret\-keyring\fR= \-\fBsecret\-keyring\fR=
@@ -2062,4 +2062,3 @@ William Manley (https://github\.com/wmanley)
Shengjing Zhu (https://github\.com/zhsj) Shengjing Zhu (https://github\.com/zhsj)
. .
.IP "" 0 .IP "" 0
pgp/gnupg.go
+1 -1
View File
@@ -44,7 +44,7 @@ func (g *GpgSigner) SetKeyRing(keyring, secretKeyring string) {
g.keyring, g.secretKeyring = keyring, secretKeyring g.keyring, g.secretKeyring = keyring, secretKeyring
} }
// SetPassphrase sets passhprase params // SetPassphrase sets passphrase params
func (g *GpgSigner) SetPassphrase(passphrase, passphraseFile string) { func (g *GpgSigner) SetPassphrase(passphrase, passphraseFile string) {
g.passphrase, g.passphraseFile = passphrase, passphraseFile g.passphrase, g.passphraseFile = passphrase, passphraseFile
} }
pgp/internal.go
+4 -4
View File
@@ -29,7 +29,7 @@ var (
// Internal errors // Internal errors
var ( var (
errWrongPasshprase = errors.New("unable to decrypt the key, passphrase is wrong") errWrongPassphrase = errors.New("unable to decrypt the key, passphrase is wrong")
) )
// GoSigner is implementation of Signer interface using Go internal OpenPGP library // GoSigner is implementation of Signer interface using Go internal OpenPGP library
@@ -60,7 +60,7 @@ func (g *GoSigner) SetKeyRing(keyring, secretKeyring string) {
g.keyringFile, g.secretKeyringFile = keyring, secretKeyring g.keyringFile, g.secretKeyringFile = keyring, secretKeyring
} }
// SetPassphrase sets passhprase params // SetPassphrase sets passphrase params
func (g *GoSigner) SetPassphrase(passphrase, passphraseFile string) { func (g *GoSigner) SetPassphrase(passphrase, passphraseFile string) {
g.passphrase, g.passphraseFile = passphrase, passphraseFile g.passphrase, g.passphraseFile = passphrase, passphraseFile
} }
@@ -182,7 +182,7 @@ func (g *GoSigner) Init() error {
g.passphrase = string(bytePassphrase) g.passphrase = string(bytePassphrase)
err = g.decryptKey() err = g.decryptKey()
if err == nil || err != errWrongPasshprase { if err == nil || err != errWrongPassphrase {
break break
} }
@@ -209,7 +209,7 @@ func (g *GoSigner) decryptKey() error {
if e, ok := err.(openpgp_errors.StructuralError); ok { if e, ok := err.(openpgp_errors.StructuralError); ok {
if string(e) == "private key checksum failure" { if string(e) == "private key checksum failure" {
return errWrongPasshprase return errWrongPassphrase
} }
} }