diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /cipher-aes.c | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) |
merge 6.3p1
Diffstat (limited to 'cipher-aes.c')
-rw-r--r-- | cipher-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cipher-aes.c b/cipher-aes.c index 07ec7aa5d..8b1017272 100644 --- a/cipher-aes.c +++ b/cipher-aes.c | |||
@@ -120,7 +120,7 @@ ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx) | |||
120 | 120 | ||
121 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { | 121 | if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { |
122 | memset(c, 0, sizeof(*c)); | 122 | memset(c, 0, sizeof(*c)); |
123 | xfree(c); | 123 | free(c); |
124 | EVP_CIPHER_CTX_set_app_data(ctx, NULL); | 124 | EVP_CIPHER_CTX_set_app_data(ctx, NULL); |
125 | } | 125 | } |
126 | return (1); | 126 | return (1); |