diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | e73e9afa91f5b9a483863ad8e01f6843c8e11fcb (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/cipher.c | |
| parent | 486cd0043eb7251b30e30aa620eb213fb48b4c22 (diff) | |
| download | src-e73e9afa91f5b9a483863ad8e01f6843c8e11fcb.tar.gz src-e73e9afa91f5b9a483863ad8e01f6843c8e11fcb.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=113911
Diffstat (limited to 'crypto/openssh/cipher.c')
| -rw-r--r-- | crypto/openssh/cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c index 254bd91df8bc..65cca55b9b00 100644 --- a/crypto/openssh/cipher.c +++ b/crypto/openssh/cipher.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.61 2002/07/12 15:50:17 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.62 2002/11/21 22:45:31 markus Exp $"); RCSID("$FreeBSD$"); #include "xmalloc.h" @@ -240,7 +240,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, cipher->name); klen = EVP_CIPHER_CTX_key_length(&cc->evp); if (klen > 0 && keylen != klen) { - debug("cipher_init: set keylen (%d -> %d)", klen, keylen); + debug2("cipher_init: set keylen (%d -> %d)", klen, keylen); if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) fatal("cipher_init: set keylen failed (%d -> %d)", klen, keylen); |