diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-05 10:26:14 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-05 10:26:14 +1100 |
commit | 960f6a2b5254e4da082d8aa3700302ed12dc769a (patch) | |
tree | 79695dff464f6d83536b4fb0db8d6de87fd84925 /cipher.c | |
parent | f7e8a8796d661c9d6692ab837e1effd4f5ada1c2 (diff) |
- djm@cvs.openbsd.org 2013/12/02 03:13:14
[cipher.c]
correct bzero of chacha20+poly1305 key context. bz#2177 from
Loganaden Velvindron @ AfriNIC
Also make it a memset for consistency with the rest of cipher.c
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.c,v 1.91 2013/11/21 00:45:44 djm Exp $ */ | 1 | /* $OpenBSD: cipher.c,v 1.92 2013/12/02 03:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -414,7 +414,7 @@ void | |||
414 | cipher_cleanup(CipherContext *cc) | 414 | cipher_cleanup(CipherContext *cc) |
415 | { | 415 | { |
416 | if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) | 416 | if ((cc->cipher->flags & CFLAG_CHACHAPOLY) != 0) |
417 | bzero(&cc->cp_ctx, sizeof(&cc->cp_ctx)); | 417 | memset(&cc->cp_ctx, 0, sizeof(cc->cp_ctx)); |
418 | else if (EVP_CIPHER_CTX_cleanup(&cc->evp) == 0) | 418 | else if (EVP_CIPHER_CTX_cleanup(&cc->evp) == 0) |
419 | error("cipher_cleanup: EVP_CIPHER_CTX_cleanup failed"); | 419 | error("cipher_cleanup: EVP_CIPHER_CTX_cleanup failed"); |
420 | } | 420 | } |