Module Name:    othersrc
Committed By:   agc
Date:           Sun Sep 18 19:27:09 UTC 2011

Modified Files:
        othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey: sharedkey.1

Log Message:
sync man page with reality


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1
diff -u othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.3 othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.4
--- othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1:1.3	Mon Mar 21 14:44:47 2011
+++ othersrc/crypto/external/bsd/sharedkey/dist/src/sharedkey/sharedkey.1	Sun Sep 18 19:27:08 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: sharedkey.1,v 1.3 2011/03/21 14:44:47 wiz Exp $
+.\" $NetBSD: sharedkey.1,v 1.4 2011/09/18 19:27:08 agc Exp $
 .\"
 .\" Copyright (c) 2010,2011 Alistair Crooks <a...@netbsd.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 20, 2011
+.Dd September 18, 2011
 .Dt SHAREDKEY 1
 .Os
 .Sh NAME
@@ -138,47 +138,42 @@
 .Bd -literal
 % sharedkey -t 2/3 /etc/group
 Generating a one-time key
-signature  2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23
-Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38
-uid              /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010
-Enter passphrase for db2d87129df8ca38:
-Repeat passphrase for db2d87129df8ca38:
-Shared secrets are in: /tmp/share.008847aa
-% ls -l /tmp/share.008847aa
-total 14
--rw-r--r--  1 agc  wheel   621 Nov 22 16:46 pubring.gpg
--rw-r--r--  1 agc  wheel  2947 Nov 22 16:46 share000.tar.gz
--rw-r--r--  1 agc  wheel  2948 Nov 22 16:46 share001.tar.gz
--rw-r--r--  1 agc  wheel  2955 Nov 22 16:46 share002.tar.gz
-% tar tvzf /tmp/share.008847aa/share000.tar.gz
-drwxr-xr-x  2 agc      wheel          0 Nov 22 16:46 share000
-lrwxr-xr-x  1 agc      wheel          0 Nov 22 16:46 share000/keyid -> db2d87129df8ca38
--rw-------  1 agc      wheel        625 Nov 22 16:46 share000/group.gpg
-lrwxr-xr-x  1 agc      wheel          0 Nov 22 16:46 share000/secret -> group.gpg
--rw-r--r--  1 agc      wheel        621 Nov 22 16:46 share000/pubring.gpg
--rw-r--r--  1 agc      wheel       1316 Nov 22 16:46 share000/secring.gpg.000
-tar: ustar vol 1, 6 files, 10240 bytes read, 0 bytes written in 1 secs (10240 bytes/sec)
-% netpgpkeys -l --homedir /tmp/share.008847aa
-1 key found
-signature  2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23
-Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38
-uid              /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010
+signature  2048/RSA (Encrypt or Sign) 6018e4d1edcd8801 2011-09-17 
+Key fingerprint: e6ba 6252 120b 2f6a b702 4223 6018 e4d1 edcd 8801 
+uid              /etc/group shared 2/3 by agc Sat Sep 17 14:32:28 2011
+netpgp: generated keys in directory /tmp/share.04718a/6018e4d1edcd8801
+Enter passphrase for 6018e4d1edcd8801: 
+Repeat passphrase for 6018e4d1edcd8801: 
+Shared secrets are in: /tmp/share.04718a
 
+% mat tvf /tmp/share.*/share000.mat
+drwx------  2 agc  wheel    512 Sep 17 14:32 share000
+lrwxr-xr-x  1 agc  wheel     16 Sep 17 14:32 share000/keyid -> 6018e4d1edcd8801
+-rw-r--r--  1 agc  wheel    623 Sep 17 14:32 share000/secret.gpg
+-rw-r--r--  1 agc  wheel    617 Sep 17 14:32 share000/pubring.gpg
+-rw-r--r--  1 agc  wheel   1323 Sep 17 14:32 share000/secring.gpg.share
+% ls -laR /tmp/share.*
+total 18
+drwx------  2 agc   wheel   512 Sep 17 14:32 .
+drwxrwxrwt  5 root  wheel   512 Sep 17 14:32 ..
+-rw-r--r--  1 agc   wheel   617 Sep 17 14:32 pubring.gpg
+-rw-------  1 agc   wheel  3444 Sep 17 14:32 share000.mat
+-rw-------  1 agc   wheel  3444 Sep 17 14:32 share001.mat
+-rw-------  1 agc   wheel  3444 Sep 17 14:32 share002.mat
+%
 .Ed
 .Pp
 Two of the shares can then be used to recover the secret in the following way:
 .Bd -literal
-% sharedkey -r -o group.recover  /tmp/share.008847aa/share000.tar.gz /tmp/share.008847aa/share001.tar.gz
-Creating file /tmp/recover.008981aa/db2d87129df8ca38/secring.gpg from files:
-signature  2048/RSA (Encrypt or Sign) db2d87129df8ca38 2010-11-23
-Key fingerprint: c632 7068 8809 2dad 15f3 f84b db2d 8712 9df8 ca38
-uid              /etc/group shared 2/3 by agc Mon Nov 22 16:46:27 PST 2010
-netpgp passphrase:
-Recovered secret in: group.recover
-
+% sharedkey -o group.recover -r /tmp/share.*/share002.mat /tmp/share.*/share000.mat
+signature  2048/RSA (Encrypt or Sign) 6018e4d1edcd8801 2011-09-17 
+Key fingerprint: e6ba 6252 120b 2f6a b702 4223 6018 e4d1 edcd 8801 
+uid              /etc/group shared 2/3 by agc Sat Sep 17 14:32:28 2011
+netpgp passphrase: 
+% diff /etc/group group.recover
 % ls -l /etc/group group.recover
 -rw-r--r--  1 root  wheel  535 Oct  4 21:44 /etc/group
--rw-------  1 agc   wheel  535 Nov 22 16:46 group.recover
+-rw-------  1 agc   wheel  535 Sep 18 16:46 group.recover
 %
 .Ed
 .Sh RETURN VALUES
@@ -188,6 +183,7 @@
 and 1 for failure.
 .Sh SEE ALSO
 .Xr tar 1 ,
+.Xr libmat 3 ,
 .Xr libnetpgp 3 ,
 .Xr libssss 3
 .Sh HISTORY

Reply via email to