Commit 564282759054010be564c76d0c4b7c1324ac8f0c - kwalletcli

Merge tag 'kwalletcli-3.02' kwalletcli_3.02.orig.tar.gz mirabilos authored 5 years ago mirabilos committed 5 years ago

4 changed file(s) with 166 addition(s) and 34 deletion(s). Raw diff Collapse all Expand all

+42

-9

kwalletaskpass.1 less more

0		.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.10 2016/08/30 18:26:43 tg Exp $
	0	.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.12 2018/12/25 19:38:12 tg Exp $
1	1	.\"-
2		.\" Copyright © 2009, 2010, 2011, 2016
	2	.\" Copyright © 2009, 2010, 2011, 2016, 2018
3	3	.\" mirabilos <m@mirbsd.org>
4	4	.\"
5	5	.\" Provided that these terms and disclaimer and all copyright notices

73	73	.\" with -mandoc, it might implement .Mx itself, but we want to
74	74	.\" use our own definition. And .Dd must come first, always.
75	75	.\"
76		.Dd $Mdocdate: August 30 2016 $
	76	.Dd $Mdocdate: December 25 2018 $
77	77	.\"
78	78	.\" Check which macro package we use, and do other -mdoc setup.
79	79	.\"

81	81	. if \[.T]utf8 .tr \[la]\(Lt
82	82	. if \[.T]utf8 .tr \[ra]\(Gt
83	83	. ie d volume-ds-1 .ds tT gnu
	84	. el .ie d doc-volume-ds-1 .ds tT gnp
84	85	. el .ds tT bsd
85	86	.\}
86	87	.el .ds tT ucb

93	94	. nr curr-font \n[.f]
94	95	. nr curr-size \n[.ps]
95	96	. ds str-Mx \f[\n[curr-font]]\s[\n[curr-size]u]
96		. ds str-Mx1 \[Tn-font-size]\%MirOS\[str-Mx]
	97	. ds str-Mx1 \[Tn-font-size]\%MirBSD\[str-Mx]
97	98	. if !\n[arg-limit] \
98	99	. if \n[.$] \{\
99	100	. ds macro-name Mx

119	120	. ds sP \s0
120	121	. ds tN \*[Tn-font-size]
121	122	.\}
	123	.el .ie "\*(tT"gnp" \{\
	124	. eo
	125	. de Mx
	126	. nr doc-curr-font \n[.f]
	127	. nr doc-curr-size \n[.ps]
	128	. ds doc-str-Mx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
	129	. ds doc-str-Mx1 \[doc-Tn-font-size]\%MirBSD\[doc-str-Mx]
	130	. if !\n[doc-arg-limit] \
	131	. if \n[.$] \{\
	132	. ds doc-macro-name Mx
	133	. doc-parse-args \$@
	134	. \}
	135	. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
	136	. nr doc-arg-ptr +1
	137	. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
	138	. as doc-str-Mx1 \~\*[doc-arg\n[doc-arg-ptr]]
	139	. el \
	140	. nr doc-arg-ptr -1
	141	. \}
	142	. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Mx1]
	143	. nr doc-type\n[doc-arg-ptr] 2
	144	. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
	145	. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
	146	. nr doc-arg-limit \n[doc-arg-ptr]
	147	. if \n[doc-num-args] \
	148	. doc-parse-space-vector
	149	. doc-print-recursive
	150	..
	151	. ec
	152	. ds sP \s0
	153	. ds tN \*[doc-Tn-font-size]
	154	.\}
122	155	.el \{\
123	156	. de Mx
124	157	. nr cF \\n(.f
125	158	. nr cZ \\n(.s
126	159	. ds aa \&\f\\n(cF\s\\n(cZ
127	160	. if \\n(aC==0 \{\
128		. ie \\n(.$==0 \&MirOS\\*(aa
	161	. ie \\n(.$==0 \&MirBSD\\*(aa
129	162	. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
130	163	. \}
131	164	. if \\n(aC>\\n(aP \{\
132	165	. nr aP \\n(aP+1
133	166	. ie \\n(C\\n(aP==2 \{\
134		. as b1 \&MirOS\ #\&\\(A\\n(aP\\(aa
	167	. as b1 \&MirBSD\ #\&\\(A\\n(aP\\(aa
135	168	. ie \\n(aC>\\n(aP \{\
136	169	. nr aP \\n(aP+1
137	170	. nR

139	172	. el .aZ
140	173	. \}
141	174	. el \{\
142		. as b1 \&MirOS\\*(aa
	175	. as b1 \&MirBSD\\*(aa
143	176	. nR
144	177	. \}
145	178	. \}

160	193	is a kwallet- and pinentry-based pass-phrase dialog for use with OpenSSH.
161	194	It is intended to be called from the
162	195	.Xr ssh\-add 1
163		programme and not invoked directly.
	196	program and not invoked directly.
164	197	.Pp
165	198	If a passphrase is requested,
166	199	.Nm

207	240	.It Ev PINENTRY
208	241	The
209	242	.Nm pinentry
210		programme to use.
	243	program to use.
211	244	The default is inherited from
212	245	.Xr kwalletcli_getpin 1 .
213	246	.El

+39

-6

kwalletcli.1 less more

0		.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.18 2018/02/09 16:33:43 tg Exp $
	0	.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.19 2018/12/25 19:38:13 tg Exp $
1	1	.\"-
2	2	.\" Copyright © 2009, 2010, 2011, 2016, 2018
3	3	.\" mirabilos <m@mirbsd.org>

73	73	.\" with -mandoc, it might implement .Mx itself, but we want to
74	74	.\" use our own definition. And .Dd must come first, always.
75	75	.\"
76		.Dd $Mdocdate: February 9 2018 $
	76	.Dd $Mdocdate: December 25 2018 $
77	77	.\"
78	78	.\" Check which macro package we use, and do other -mdoc setup.
79	79	.\"

81	81	. if \[.T]utf8 .tr \[la]\(Lt
82	82	. if \[.T]utf8 .tr \[ra]\(Gt
83	83	. ie d volume-ds-1 .ds tT gnu
	84	. el .ie d doc-volume-ds-1 .ds tT gnp
84	85	. el .ds tT bsd
85	86	.\}
86	87	.el .ds tT ucb

93	94	. nr curr-font \n[.f]
94	95	. nr curr-size \n[.ps]
95	96	. ds str-Mx \f[\n[curr-font]]\s[\n[curr-size]u]
96		. ds str-Mx1 \[Tn-font-size]\%MirOS\[str-Mx]
	97	. ds str-Mx1 \[Tn-font-size]\%MirBSD\[str-Mx]
97	98	. if !\n[arg-limit] \
98	99	. if \n[.$] \{\
99	100	. ds macro-name Mx

119	120	. ds sP \s0
120	121	. ds tN \*[Tn-font-size]
121	122	.\}
	123	.el .ie "\*(tT"gnp" \{\
	124	. eo
	125	. de Mx
	126	. nr doc-curr-font \n[.f]
	127	. nr doc-curr-size \n[.ps]
	128	. ds doc-str-Mx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
	129	. ds doc-str-Mx1 \[doc-Tn-font-size]\%MirBSD\[doc-str-Mx]
	130	. if !\n[doc-arg-limit] \
	131	. if \n[.$] \{\
	132	. ds doc-macro-name Mx
	133	. doc-parse-args \$@
	134	. \}
	135	. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
	136	. nr doc-arg-ptr +1
	137	. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
	138	. as doc-str-Mx1 \~\*[doc-arg\n[doc-arg-ptr]]
	139	. el \
	140	. nr doc-arg-ptr -1
	141	. \}
	142	. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Mx1]
	143	. nr doc-type\n[doc-arg-ptr] 2
	144	. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
	145	. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
	146	. nr doc-arg-limit \n[doc-arg-ptr]
	147	. if \n[doc-num-args] \
	148	. doc-parse-space-vector
	149	. doc-print-recursive
	150	..
	151	. ec
	152	. ds sP \s0
	153	. ds tN \*[doc-Tn-font-size]
	154	.\}
122	155	.el \{\
123	156	. de Mx
124	157	. nr cF \\n(.f
125	158	. nr cZ \\n(.s
126	159	. ds aa \&\f\\n(cF\s\\n(cZ
127	160	. if \\n(aC==0 \{\
128		. ie \\n(.$==0 \&MirOS\\*(aa
	161	. ie \\n(.$==0 \&MirBSD\\*(aa
129	162	. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
130	163	. \}
131	164	. if \\n(aC>\\n(aP \{\
132	165	. nr aP \\n(aP+1
133	166	. ie \\n(C\\n(aP==2 \{\
134		. as b1 \&MirOS\ #\&\\(A\\n(aP\\(aa
	167	. as b1 \&MirBSD\ #\&\\(A\\n(aP\\(aa
135	168	. ie \\n(aC>\\n(aP \{\
136	169	. nr aP \\n(aP+1
137	170	. nR

139	172	. el .aZ
140	173	. \}
141	174	. el \{\
142		. as b1 \&MirOS\\*(aa
	175	. as b1 \&MirBSD\\*(aa
143	176	. nR
144	177	. \}
145	178	. \}

+43

-10

kwalletcli_getpin.1 less more

0		.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli_getpin.1,v 1.18 2016/08/30 17:37:58 tg Exp $
	0	.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli_getpin.1,v 1.20 2018/12/25 19:38:13 tg Exp $
1	1	.\"-
2		.\" Copyright © 2009, 2011, 2016
	2	.\" Copyright © 2009, 2011, 2016, 2018
3	3	.\" mirabilos <m@mirbsd.org>
4	4	.\"
5	5	.\" Provided that these terms and disclaimer and all copyright notices

73	73	.\" with -mandoc, it might implement .Mx itself, but we want to
74	74	.\" use our own definition. And .Dd must come first, always.
75	75	.\"
76		.Dd $Mdocdate: August 30 2016 $
	76	.Dd $Mdocdate: December 25 2018 $
77	77	.\"
78	78	.\" Check which macro package we use, and do other -mdoc setup.
79	79	.\"

81	81	. if \[.T]utf8 .tr \[la]\(Lt
82	82	. if \[.T]utf8 .tr \[ra]\(Gt
83	83	. ie d volume-ds-1 .ds tT gnu
	84	. el .ie d doc-volume-ds-1 .ds tT gnp
84	85	. el .ds tT bsd
85	86	.\}
86	87	.el .ds tT ucb

93	94	. nr curr-font \n[.f]
94	95	. nr curr-size \n[.ps]
95	96	. ds str-Mx \f[\n[curr-font]]\s[\n[curr-size]u]
96		. ds str-Mx1 \[Tn-font-size]\%MirOS\[str-Mx]
	97	. ds str-Mx1 \[Tn-font-size]\%MirBSD\[str-Mx]
97	98	. if !\n[arg-limit] \
98	99	. if \n[.$] \{\
99	100	. ds macro-name Mx

119	120	. ds sP \s0
120	121	. ds tN \*[Tn-font-size]
121	122	.\}
	123	.el .ie "\*(tT"gnp" \{\
	124	. eo
	125	. de Mx
	126	. nr doc-curr-font \n[.f]
	127	. nr doc-curr-size \n[.ps]
	128	. ds doc-str-Mx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
	129	. ds doc-str-Mx1 \[doc-Tn-font-size]\%MirBSD\[doc-str-Mx]
	130	. if !\n[doc-arg-limit] \
	131	. if \n[.$] \{\
	132	. ds doc-macro-name Mx
	133	. doc-parse-args \$@
	134	. \}
	135	. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
	136	. nr doc-arg-ptr +1
	137	. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
	138	. as doc-str-Mx1 \~\*[doc-arg\n[doc-arg-ptr]]
	139	. el \
	140	. nr doc-arg-ptr -1
	141	. \}
	142	. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Mx1]
	143	. nr doc-type\n[doc-arg-ptr] 2
	144	. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
	145	. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
	146	. nr doc-arg-limit \n[doc-arg-ptr]
	147	. if \n[doc-num-args] \
	148	. doc-parse-space-vector
	149	. doc-print-recursive
	150	..
	151	. ec
	152	. ds sP \s0
	153	. ds tN \*[doc-Tn-font-size]
	154	.\}
122	155	.el \{\
123	156	. de Mx
124	157	. nr cF \\n(.f
125	158	. nr cZ \\n(.s
126	159	. ds aa \&\f\\n(cF\s\\n(cZ
127	160	. if \\n(aC==0 \{\
128		. ie \\n(.$==0 \&MirOS\\*(aa
	161	. ie \\n(.$==0 \&MirBSD\\*(aa
129	162	. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
130	163	. \}
131	164	. if \\n(aC>\\n(aP \{\
132	165	. nr aP \\n(aP+1
133	166	. ie \\n(C\\n(aP==2 \{\
134		. as b1 \&MirOS\ #\&\\(A\\n(aP\\(aa
	167	. as b1 \&MirBSD\ #\&\\(A\\n(aP\\(aa
135	168	. ie \\n(aC>\\n(aP \{\
136	169	. nr aP \\n(aP+1
137	170	. nR

139	172	. el .aZ
140	173	. \}
141	174	. el \{\
142		. as b1 \&MirOS\\*(aa
	175	. as b1 \&MirBSD\\*(aa
143	176	. nR
144	177	. \}
145	178	. \}

172	205	.Pp
173	206	If
174	207	.Ev PINENTRY
175		is not empty but points to a non-existing or failing programme,
	208	is not empty but points to a non-existing or failing program,
176	209	.Nm pinentry
177	210	is not called.
178	211	Instead,

283	316	.It Ev PINENTRY
284	317	The
285	318	.Nm pinentry
286		programme to use.
	319	program to use.
287	320	Default:
288	321	.Dq pinentry
289	322	.El

305	338	.Sh BUGS
306	339	Some
307	340	.Nm pinentry
308		programmes may not support messages correctly and display
	341	programs may not support messages correctly and display
309	342	them as boolean queries instead.
310	343	.Pp
311	344	Some implementations display labels with the wrong charset.

+42

-9

pinentry-kwallet.1 less more

0		.\" $MirOS: contrib/hosted/tg/code/kwalletcli/pinentry-kwallet.1,v 1.10 2016/08/30 17:37:59 tg Exp $
	0	.\" $MirOS: contrib/hosted/tg/code/kwalletcli/pinentry-kwallet.1,v 1.12 2018/12/25 19:38:13 tg Exp $
1	1	.\"-
2		.\" Copyright © 2009, 2010, 2011, 2016
	2	.\" Copyright © 2009, 2010, 2011, 2016, 2018
3	3	.\" mirabilos <m@mirbsd.org>
4	4	.\"
5	5	.\" Provided that these terms and disclaimer and all copyright notices

73	73	.\" with -mandoc, it might implement .Mx itself, but we want to
74	74	.\" use our own definition. And .Dd must come first, always.
75	75	.\"
76		.Dd $Mdocdate: August 30 2016 $
	76	.Dd $Mdocdate: December 25 2018 $
77	77	.\"
78	78	.\" Check which macro package we use, and do other -mdoc setup.
79	79	.\"

81	81	. if \[.T]utf8 .tr \[la]\(Lt
82	82	. if \[.T]utf8 .tr \[ra]\(Gt
83	83	. ie d volume-ds-1 .ds tT gnu
	84	. el .ie d doc-volume-ds-1 .ds tT gnp
84	85	. el .ds tT bsd
85	86	.\}
86	87	.el .ds tT ucb

93	94	. nr curr-font \n[.f]
94	95	. nr curr-size \n[.ps]
95	96	. ds str-Mx \f[\n[curr-font]]\s[\n[curr-size]u]
96		. ds str-Mx1 \[Tn-font-size]\%MirOS\[str-Mx]
	97	. ds str-Mx1 \[Tn-font-size]\%MirBSD\[str-Mx]
97	98	. if !\n[arg-limit] \
98	99	. if \n[.$] \{\
99	100	. ds macro-name Mx

119	120	. ds sP \s0
120	121	. ds tN \*[Tn-font-size]
121	122	.\}
	123	.el .ie "\*(tT"gnp" \{\
	124	. eo
	125	. de Mx
	126	. nr doc-curr-font \n[.f]
	127	. nr doc-curr-size \n[.ps]
	128	. ds doc-str-Mx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
	129	. ds doc-str-Mx1 \[doc-Tn-font-size]\%MirBSD\[doc-str-Mx]
	130	. if !\n[doc-arg-limit] \
	131	. if \n[.$] \{\
	132	. ds doc-macro-name Mx
	133	. doc-parse-args \$@
	134	. \}
	135	. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
	136	. nr doc-arg-ptr +1
	137	. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
	138	. as doc-str-Mx1 \~\*[doc-arg\n[doc-arg-ptr]]
	139	. el \
	140	. nr doc-arg-ptr -1
	141	. \}
	142	. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Mx1]
	143	. nr doc-type\n[doc-arg-ptr] 2
	144	. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
	145	. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
	146	. nr doc-arg-limit \n[doc-arg-ptr]
	147	. if \n[doc-num-args] \
	148	. doc-parse-space-vector
	149	. doc-print-recursive
	150	..
	151	. ec
	152	. ds sP \s0
	153	. ds tN \*[doc-Tn-font-size]
	154	.\}
122	155	.el \{\
123	156	. de Mx
124	157	. nr cF \\n(.f
125	158	. nr cZ \\n(.s
126	159	. ds aa \&\f\\n(cF\s\\n(cZ
127	160	. if \\n(aC==0 \{\
128		. ie \\n(.$==0 \&MirOS\\*(aa
	161	. ie \\n(.$==0 \&MirBSD\\*(aa
129	162	. el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
130	163	. \}
131	164	. if \\n(aC>\\n(aP \{\
132	165	. nr aP \\n(aP+1
133	166	. ie \\n(C\\n(aP==2 \{\
134		. as b1 \&MirOS\ #\&\\(A\\n(aP\\(aa
	167	. as b1 \&MirBSD\ #\&\\(A\\n(aP\\(aa
135	168	. ie \\n(aC>\\n(aP \{\
136	169	. nr aP \\n(aP+1
137	170	. nR

139	172	. el .aZ
140	173	. \}
141	174	. el \{\
142		. as b1 \&MirOS\\*(aa
	175	. as b1 \&MirBSD\\*(aa
143	176	. nR
144	177	. \}
145	178	. \}

218	251	.Nm
219	252	will immediately replace itself with the slave
220	253	.Ev PINENTRY
221		programme to use.
	254	program to use.
222	255	.It Ev GPG_TERM
223	256	Terminal type of the current tty.
224	257	.It Ev GPG_TTY

226	259	.It Ev PINENTRY
227	260	The
228	261	.Nm pinentry
229		programme to use.
	262	program to use.
230	263	Default:
231	264	.Dq pinentry
232	265	.El