~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tripe-admin.5.in: Add missing documentation for error messages.
[tripe]
/
server
/
keyset.c
diff --git
a/server/keyset.c
b/server/keyset.c
index
2f2b550
..
9429fa4
100644
(file)
--- a/
server/keyset.c
+++ b/
server/keyset.c
@@
-82,7
+82,7
@@
static int doencrypt(keyset *ks, unsigned ty, buf *b, buf *bb)
IF_TRACING(T_KEYSET, {
trace(T_KEYSET,
IF_TRACING(T_KEYSET, {
trace(T_KEYSET,
- "keyset: encrypting packet %lu (type
%u
) using keyset %u",
+ "keyset: encrypting packet %lu (type
0x%02x
) using keyset %u",
(unsigned long)ks->oseq, ty, ks->seq);
trace_block(T_CRYPTO, "crypto: plaintext packet", BCUR(b), sz);
})
(unsigned long)ks->oseq, ty, ks->seq);
trace_block(T_CRYPTO, "crypto: plaintext packet", BCUR(b), sz);
})
@@
-134,7
+134,7
@@
static int dodecrypt(keyset *ks, unsigned ty, buf *b, buf *bb, uint32 *seq)
IF_TRACING(T_KEYSET, {
trace(T_KEYSET,
IF_TRACING(T_KEYSET, {
trace(T_KEYSET,
- "keyset: try decrypting packet (type
%u
) using keyset %u",
+ "keyset: try decrypting packet (type
0x%02x
) using keyset %u",
ty, ks->seq);
trace_block(T_CRYPTO, "crypto: ciphertext packet", BCUR(b), BLEFT(b));
})
ty, ks->seq);
trace_block(T_CRYPTO, "crypto: ciphertext packet", BCUR(b), BLEFT(b));
})
@@
-238,9
+238,8
@@
void ks_derivekey(octet *k, size_t ksz, const struct rawkey *rk,
* the key material; between @k + x@ and @k + y@ is `your'
* contribution; and between @k + y@ and @k + z@ is a shared
* value we made together. These are used to construct two
* the key material; between @k + x@ and @k + y@ is `your'
* contribution; and between @k + y@ and @k + z@ is a shared
* value we made together. These are used to construct two
- * pairs of symmetric keys. Each pair consists of an encryption
- * key and a message authentication key. One pair is used for
- * outgoing messages, the other for incoming messages.
+ * collections of symmetric keys: one for outgoing messages, the
+ * other for incoming messages.
*
* The new key is marked so that it won't be selected for output
* by @ksl_encrypt@. You can still encrypt data with it by
*
* The new key is marked so that it won't be selected for output
* by @ksl_encrypt@. You can still encrypt data with it by