diff options
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.75 2005/06/09 13:43:49 dtucker Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.76 2005/06/17 02:44:32 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -235,7 +235,7 @@ cipher_init(CipherContext *cc, Cipher *cipher, | |||
235 | fatal("cipher_init: EVP_CipherInit failed for %s", | 235 | fatal("cipher_init: EVP_CipherInit failed for %s", |
236 | cipher->name); | 236 | cipher->name); |
237 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); | 237 | klen = EVP_CIPHER_CTX_key_length(&cc->evp); |
238 | if (klen > 0 && keylen != klen) { | 238 | if (klen > 0 && keylen != (u_int)klen) { |
239 | debug2("cipher_init: set keylen (%d -> %d)", klen, keylen); | 239 | debug2("cipher_init: set keylen (%d -> %d)", klen, keylen); |
240 | if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) | 240 | if (EVP_CIPHER_CTX_set_key_length(&cc->evp, keylen) == 0) |
241 | fatal("cipher_init: set keylen failed (%d -> %d)", | 241 | fatal("cipher_init: set keylen failed (%d -> %d)", |
@@ -326,9 +326,9 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) | |||
326 | case SSH_CIPHER_DES: | 326 | case SSH_CIPHER_DES: |
327 | case SSH_CIPHER_BLOWFISH: | 327 | case SSH_CIPHER_BLOWFISH: |
328 | evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); | 328 | evplen = EVP_CIPHER_CTX_iv_length(&cc->evp); |
329 | if (evplen == 0) | 329 | if (evplen <= 0) |
330 | return; | 330 | return; |
331 | if (evplen != len) | 331 | if ((u_int)evplen != len) |
332 | fatal("%s: wrong iv length %d != %d", __func__, | 332 | fatal("%s: wrong iv length %d != %d", __func__, |
333 | evplen, len); | 333 | evplen, len); |
334 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 334 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |