diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /ssh-ecdsa.c | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'ssh-ecdsa.c')
-rw-r--r-- | ssh-ecdsa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index 085468ee7..766338941 100644 --- a/ssh-ecdsa.c +++ b/ssh-ecdsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-ecdsa.c,v 1.5 2012/01/08 13:17:11 miod Exp $ */ | 1 | /* $OpenBSD: ssh-ecdsa.c,v 1.6 2013/05/17 00:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -119,16 +119,16 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen, | |||
119 | if (strcmp(key_ssh_name_plain(key), ktype) != 0) { | 119 | if (strcmp(key_ssh_name_plain(key), ktype) != 0) { |
120 | error("%s: cannot handle type %s", __func__, ktype); | 120 | error("%s: cannot handle type %s", __func__, ktype); |
121 | buffer_free(&b); | 121 | buffer_free(&b); |
122 | xfree(ktype); | 122 | free(ktype); |
123 | return -1; | 123 | return -1; |
124 | } | 124 | } |
125 | xfree(ktype); | 125 | free(ktype); |
126 | sigblob = buffer_get_string(&b, &len); | 126 | sigblob = buffer_get_string(&b, &len); |
127 | rlen = buffer_len(&b); | 127 | rlen = buffer_len(&b); |
128 | buffer_free(&b); | 128 | buffer_free(&b); |
129 | if (rlen != 0) { | 129 | if (rlen != 0) { |
130 | error("%s: remaining bytes in signature %d", __func__, rlen); | 130 | error("%s: remaining bytes in signature %d", __func__, rlen); |
131 | xfree(sigblob); | 131 | free(sigblob); |
132 | return -1; | 132 | return -1; |
133 | } | 133 | } |
134 | 134 | ||
@@ -149,7 +149,7 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen, | |||
149 | 149 | ||
150 | /* clean up */ | 150 | /* clean up */ |
151 | memset(sigblob, 0, len); | 151 | memset(sigblob, 0, len); |
152 | xfree(sigblob); | 152 | free(sigblob); |
153 | 153 | ||
154 | /* hash the data */ | 154 | /* hash the data */ |
155 | EVP_DigestInit(&md, evp_md); | 155 | EVP_DigestInit(&md, evp_md); |