diff options
author | djm@openbsd.org@openbsd.org <djm@openbsd.org@openbsd.org> | 2017-11-03 02:22:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-11-03 13:24:59 +1100 |
commit | 41bff4da21fcd8a7c6a83a7e0f92b018f904f6fb (patch) | |
tree | f4119189bb68bfc3fd492e5fa85c235e8d316220 /cipher.c | |
parent | 6b373e4635a7470baa94253dd1dc8953663da9e8 (diff) |
upstream commit
avoid unused variable warnings for !WITH_OPENSSL; patch from
Marcus Folkesson
OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.c,v 1.107 2017/05/07 23:12:57 djm Exp $ */ | 1 | /* $OpenBSD: cipher.c,v 1.108 2017/11/03 02:22:41 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -449,8 +449,8 @@ cipher_get_keyiv_len(const struct sshcipher_ctx *cc) | |||
449 | int | 449 | int |
450 | cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len) | 450 | cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len) |
451 | { | 451 | { |
452 | const struct sshcipher *c = cc->cipher; | ||
453 | #ifdef WITH_OPENSSL | 452 | #ifdef WITH_OPENSSL |
453 | const struct sshcipher *c = cc->cipher; | ||
454 | int evplen; | 454 | int evplen; |
455 | #endif | 455 | #endif |
456 | 456 | ||
@@ -494,8 +494,8 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len) | |||
494 | int | 494 | int |
495 | cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) | 495 | cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) |
496 | { | 496 | { |
497 | const struct sshcipher *c = cc->cipher; | ||
498 | #ifdef WITH_OPENSSL | 497 | #ifdef WITH_OPENSSL |
498 | const struct sshcipher *c = cc->cipher; | ||
499 | int evplen = 0; | 499 | int evplen = 0; |
500 | #endif | 500 | #endif |
501 | 501 | ||