diff options
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.c,v 1.88 2013/04/19 01:06:50 djm Exp $ */ | 1 | /* $OpenBSD: cipher.c,v 1.89 2013/05/17 00:13:13 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 |
@@ -205,14 +205,14 @@ ciphers_valid(const char *names) | |||
205 | c = cipher_by_name(p); | 205 | c = cipher_by_name(p); |
206 | if (c == NULL || c->number != SSH_CIPHER_SSH2) { | 206 | if (c == NULL || c->number != SSH_CIPHER_SSH2) { |
207 | debug("bad cipher %s [%s]", p, names); | 207 | debug("bad cipher %s [%s]", p, names); |
208 | xfree(cipher_list); | 208 | free(cipher_list); |
209 | return 0; | 209 | return 0; |
210 | } else { | 210 | } else { |
211 | debug3("cipher ok: %s [%s]", p, names); | 211 | debug3("cipher ok: %s [%s]", p, names); |
212 | } | 212 | } |
213 | } | 213 | } |
214 | debug3("ciphers ok: [%s]", names); | 214 | debug3("ciphers ok: [%s]", names); |
215 | xfree(cipher_list); | 215 | free(cipher_list); |
216 | return 1; | 216 | return 1; |
217 | } | 217 | } |
218 | 218 | ||
@@ -314,8 +314,8 @@ cipher_init(CipherContext *cc, const Cipher *cipher, | |||
314 | cipher->discard_len) == 0) | 314 | cipher->discard_len) == 0) |
315 | fatal("evp_crypt: EVP_Cipher failed during discard"); | 315 | fatal("evp_crypt: EVP_Cipher failed during discard"); |
316 | memset(discard, 0, cipher->discard_len); | 316 | memset(discard, 0, cipher->discard_len); |
317 | xfree(junk); | 317 | free(junk); |
318 | xfree(discard); | 318 | free(discard); |
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||