diff options
| author |   djm <djm@openbsd.org> | 2013-05-17 00:13:13 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-05-17 00:13:13 +0000 |
| commit | 0d40fefd5c44016278e5af8155da9b06ebdf4527 (patch) | |
| tree | 4a9db9d89b25874840f0a2812731f84c08b95893 /usr.bin/ssh/cipher.c | |
| parent | burner support (diff) | |
| download | wireguard-openbsd-0d40fefd5c44016278e5af8155da9b06ebdf4527.tar.xz wireguard-openbsd-0d40fefd5c44016278e5af8155da9b06ebdf4527.zip | |
bye, bye xfree(); ok markus@
Diffstat (limited to 'usr.bin/ssh/cipher.c')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index e7ea118eaa6..25ecaa324fa 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.c,v 1.88 2013/04/19 01:06:50 djm Exp $ */ +/* $OpenBSD: cipher.c,v 1.89 2013/05/17 00:13:13 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -199,14 +199,14 @@ ciphers_valid(const char *names) c = cipher_by_name(p); if (c == NULL || c->number != SSH_CIPHER_SSH2) { debug("bad cipher %s [%s]", p, names); - xfree(cipher_list); + free(cipher_list); return 0; } else { debug3("cipher ok: %s [%s]", p, names); } } debug3("ciphers ok: [%s]", names); - xfree(cipher_list); + free(cipher_list); return 1; } @@ -294,8 +294,8 @@ cipher_init(CipherContext *cc, const Cipher *cipher, cipher->discard_len) == 0) fatal("evp_crypt: EVP_Cipher failed during discard"); memset(discard, 0, cipher->discard_len); - xfree(junk); - xfree(discard); + free(junk); + free(discard); } } |