From bcd00abd8451f36142ae2ee10cc657202149201e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 7 Dec 2013 10:41:55 +1100 Subject: - 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@ --- cipher.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cipher.h') diff --git a/cipher.h b/cipher.h index 4e837a754..d78245615 100644 --- a/cipher.h +++ b/cipher.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.h,v 1.42 2013/11/21 00:45:44 djm Exp $ */ +/* $OpenBSD: cipher.h,v 1.43 2013/12/06 13:34:54 markus Exp $ */ /* * Author: Tatu Ylonen @@ -81,7 +81,7 @@ int ciphers_valid(const char *); char *cipher_alg_list(char, int); void cipher_init(CipherContext *, const Cipher *, const u_char *, u_int, const u_char *, u_int, int); -void cipher_crypt(CipherContext *, u_int, u_char *, const u_char *, +int cipher_crypt(CipherContext *, u_int, u_char *, const u_char *, u_int, u_int, u_int); int cipher_get_length(CipherContext *, u_int *, u_int, const u_char *, u_int); -- cgit v1.2.3