modifications to match recent changes. that's just preparation of more changes towards PBP-Compatibility. Current state is UNSTABLE. See TODO for details whats left to do.

man/pcp1.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PCP1 1"
-.TH PCP1 1 "2014-01-16" "PCP 0.1.5" "USER CONTRIBUTED DOCUMENTATION"
+.TH PCP1 1 "2014-01-19" "PCP 0.1.5" "USER CONTRIBUTED DOCUMENTATION"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -332,43 +332,20 @@ Each key can be identified using its \fBkeyid\fR which looks like this:
 .Ve
 .PP
 A public key exported from a secret key will have the same keyid
-as the secret key. When using for encryption, the keyid will be
-added to the message so that the receiver knows who was the
-sender of the message (\fBThis might change in the future. As of
-this writing I'm not sure if this was a good idea\fR).
+as the secret key.
 .PP
 If you just want to know details about a key or the vault, use the
 \&\fB\-t\fR option.
-.SS "Derived Public Keys"
-.IX Subsection "Derived Public Keys"
-In the real world you would not use your primary key to encrypt
-messages, because this would require to send the public key part
-to your recipient in one way or another. The much better and more
-secure way is to use a \fBDerived Public Key\fR:
-.PP
-Such a key will be dynamically generated from a hash of your
-primary secret key and the recipient (an email address, name or key id).
-The public part of this dynamic key will be exported and sent to
-the recipient. A public key generated this way will only be usable
-by the recipient (and yourself) and each recipient will have a different
-public key from you (and vice versa).
 .SH "ENCRYPTION"
 .IX Header "ENCRYPTION"
-There are 3 modi for encryption available in pcp1:
+There are 2 modes of encryption available in pcp1:
 .IP "\fBStandard public key encryption\fR" 4
 .IX Item "Standard public key encryption"
 In this mode, which is the default, a public key as specified
-with \fB\-i\fR and the primary secret key will be used for encryption.
-The public key in question maybe a derived public key, which
-is transparent for the sender however.
-.Sp
-If you don't use derived keys, you will have to transfer
-the public key part of your primary keypair to the recipient,
-which is considered insecure if the transfer channel itself
-uses untrusted transports or if the transferred public key
-ends up on a public system (a shared server, a workstation
-at your employer or the like). You should avoid this encryption
-mode in such cases and use derived keys instead.
+with \fB\-i\fR and a dynamically generated secret key will be used
+for encryption. The public part of the generated sender key
+will be included with the encrypted file, which the recipient
+can use to decrypt it.
 .Sp
 Example command:
 .Sp
@@ -378,28 +355,6 @@ Example command:
 .Sp
 Here we didn't specify a recipient. Therefore the public
 key given with \-i will be used directly.
-.IP "\fBDerived public key encryption\fR" 4
-.IX Item "Derived public key encryption"
-Derived keys will be generated dynamically at runtime
-(see \fBDerived Public Keys\fR above). Therefore an exported
-derived public key is unique for the sender \s-1AND\s0 recipient.
-.Sp
-This mode can be considered the most secure. If such a key
-gets lost (or into the wrong hands), only this specific
-communication channel will be compromised.
-.Sp
-Example command:
-.Sp
-.Vb 1
-\& pcp1 \-e \-r bobby@local \-I message.txt \-O cipher.z85
-.Ve
-.Sp
-We specified a recipient. pcp1 searches the vault for a
-matching public key and generates a derived keypair for
-encryption. You need to have a public key installed from
-the recipient anyway, it won't work without one. You may
-also specify a key id (\-i) as well to make sure, the right
-key will be used for derivation.
 .IP "\fBSelf encryption mode\fR" 4
 .IX Item "Self encryption mode"
 Pretty Curved Privacy doesn't provide symetric file encryption.
@@ -577,11 +532,13 @@ Take a look at the function \fB\f(BIpcp_keypairs()\fB\fR for details.
 Encrypted output will always be Z85 encoded and has the following
 format:
 .PP
-.Vb 7
+.Vb 9
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 \& | Field         Size      Description                     |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
-\& | Hash        |     32 | Hash of the sender key id        |
+\& | Pubkey      |     32 | Publix key of the sender         |
+\& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+\& | Nonce       |     24 | Random Nonce                     |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 \& | Encrypted   |      ~ | The actual encrypted data        |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+