diff options
| author | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
| commit | cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a (patch) | |
| tree | a72d0647ecce54e017341118e11204ee4ba0de68 /crypto/openssh/compat.c | |
| parent | 3e16db31d109ec87db0aa5d7fcd63e93398259d4 (diff) | |
| parent | ff2597d3eebc3da3f7cf2a638607274cad9b199e (diff) | |
| download | FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.zip FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.tar.gz | |
Upgrade to 6.3p1.
Approved by: re (gjb)
Diffstat (limited to 'crypto/openssh/compat.c')
| -rw-r--r-- | crypto/openssh/compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/compat.c b/crypto/openssh/compat.c index e357faf9..17d2a18 100644 --- a/crypto/openssh/compat.c +++ b/crypto/openssh/compat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.c,v 1.80 2012/08/17 01:30:00 djm Exp $ */ +/* $OpenBSD: compat.c,v 1.81 2013/05/17 00:13:13 djm Exp $ */ /* $FreeBSD$ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. @@ -215,7 +215,7 @@ proto_spec(const char *spec) break; } } - xfree(s); + free(s); return ret; } @@ -241,7 +241,7 @@ compat_cipher_proposal(char *cipher_prop) buffer_append(&b, "\0", 1); fix_ciphers = xstrdup(buffer_ptr(&b)); buffer_free(&b); - xfree(orig_prop); + free(orig_prop); debug2("Original cipher proposal: %s", cipher_prop); debug2("Compat cipher proposal: %s", fix_ciphers); if (!*fix_ciphers) |
