diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /umac.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'umac.c')
-rw-r--r-- | umac.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: umac.c,v 1.18 2019/11/13 04:47:52 deraadt Exp $ */ | 1 | /* $OpenBSD: umac.c,v 1.20 2020/03/13 03:17:07 djm Exp $ */ |
2 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
3 | * | 3 | * |
4 | * umac.c -- C Implementation UMAC Message Authentication | 4 | * umac.c -- C Implementation UMAC Message Authentication |
@@ -39,7 +39,7 @@ | |||
39 | * at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ (search for | 39 | * at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ (search for |
40 | * "Barreto"). The only two files needed are rijndael-alg-fst.c and | 40 | * "Barreto"). The only two files needed are rijndael-alg-fst.c and |
41 | * rijndael-alg-fst.h. Brian Gladman's version is distributed with the GNU | 41 | * rijndael-alg-fst.h. Brian Gladman's version is distributed with the GNU |
42 | * Public lisence at http://fp.gladman.plus.com/AES/index.htm. It | 42 | * Public license at http://fp.gladman.plus.com/AES/index.htm. It |
43 | * includes a fast IA-32 assembly version. The OpenSSL crypo library is | 43 | * includes a fast IA-32 assembly version. The OpenSSL crypo library is |
44 | * the third. | 44 | * the third. |
45 | * | 45 | * |
@@ -1205,8 +1205,7 @@ int umac_delete(struct umac_ctx *ctx) | |||
1205 | if (ctx) { | 1205 | if (ctx) { |
1206 | if (ALLOC_BOUNDARY) | 1206 | if (ALLOC_BOUNDARY) |
1207 | ctx = (struct umac_ctx *)ctx->free_ptr; | 1207 | ctx = (struct umac_ctx *)ctx->free_ptr; |
1208 | explicit_bzero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); | 1208 | freezero(ctx, sizeof(*ctx) + ALLOC_BOUNDARY); |
1209 | free(ctx); | ||
1210 | } | 1209 | } |
1211 | return (1); | 1210 | return (1); |
1212 | } | 1211 | } |