diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
| commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
| tree | 86848a7668424b392d48791a0e41e05f9df7b62b /kexecdhs.c | |
| parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
| parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) | |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'kexecdhs.c')
| -rw-r--r-- | kexecdhs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index 6fbb79c9d..2700b7219 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: kexecdhs.c,v 1.9 2014/01/12 08:13:13 djm Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.10 2014/02/02 03:44:31 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
| 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
| @@ -103,7 +103,7 @@ kexecdh_server(Kex *kex) | |||
| 103 | fatal("%s: BN_new failed", __func__); | 103 | fatal("%s: BN_new failed", __func__); |
| 104 | if (BN_bin2bn(kbuf, klen, shared_secret) == NULL) | 104 | if (BN_bin2bn(kbuf, klen, shared_secret) == NULL) |
| 105 | fatal("%s: BN_bin2bn failed", __func__); | 105 | fatal("%s: BN_bin2bn failed", __func__); |
| 106 | memset(kbuf, 0, klen); | 106 | explicit_bzero(kbuf, klen); |
| 107 | free(kbuf); | 107 | free(kbuf); |
| 108 | 108 | ||
| 109 | /* calc H */ | 109 | /* calc H */ |