summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-07 10:41:55 +1100
committerDamien Miller <djm@mindrot.org>2013-12-07 10:41:55 +1100
commitbcd00abd8451f36142ae2ee10cc657202149201e (patch)
tree946db23f1ec607d9260e46b9f6f2422e0e9c970c /cipher.h
parentf0e9060d236c0e38bec2fa1c6579fb0a2ea6458d (diff)
- markus@cvs.openbsd.org 2013/12/06 13:34:54
[authfile.c authfile.h cipher.c cipher.h key.c packet.c ssh-agent.c] [ssh-keygen.c PROTOCOL.key] new private key format, bcrypt as KDF by default; details in PROTOCOL.key; feedback and lots help from djm; ok djm@
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher.h b/cipher.h
index 4e837a754..d78245615 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cipher.h,v 1.42 2013/11/21 00:45:44 djm Exp $ */ 1/* $OpenBSD: cipher.h,v 1.43 2013/12/06 13:34:54 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -81,7 +81,7 @@ int ciphers_valid(const char *);
81char *cipher_alg_list(char, int); 81char *cipher_alg_list(char, int);
82void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, 82void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int,
83 const u_char *, u_int, int); 83 const u_char *, u_int, int);
84void cipher_crypt(CipherContext *, u_int, u_char *, const u_char *, 84int cipher_crypt(CipherContext *, u_int, u_char *, const u_char *,
85 u_int, u_int, u_int); 85 u_int, u_int, u_int);
86int cipher_get_length(CipherContext *, u_int *, u_int, 86int cipher_get_length(CipherContext *, u_int *, u_int,
87 const u_char *, u_int); 87 const u_char *, u_int);