upstream commit

avoid unused variable warnings for !WITH_OPENSSL; patch from
Marcus Folkesson

OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229
This commit is contained in:
djm@openbsd.org@openbsd.org 2017-11-03 02:22:41 +00:00 committed by Damien Miller
parent 6b373e4635
commit 41bff4da21
1 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: cipher.c,v 1.107 2017/05/07 23:12:57 djm Exp $ */ /* $OpenBSD: cipher.c,v 1.108 2017/11/03 02:22:41 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -449,8 +449,8 @@ cipher_get_keyiv_len(const struct sshcipher_ctx *cc)
int int
cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len) cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
{ {
const struct sshcipher *c = cc->cipher;
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
const struct sshcipher *c = cc->cipher;
int evplen; int evplen;
#endif #endif
@ -494,8 +494,8 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, u_int len)
int int
cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv) cipher_set_keyiv(struct sshcipher_ctx *cc, const u_char *iv)
{ {
const struct sshcipher *c = cc->cipher;
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
const struct sshcipher *c = cc->cipher;
int evplen = 0; int evplen = 0;
#endif #endif