Module Name: src Committed By: riastradh Date: Tue Jul 28 14:01:35 UTC 2020
Modified Files: src/sys/crypto/aes/arch/x86: aes_via.c Log Message: Initialize authctr in both branches. I guess I didn't test the unaligned case, weird. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/crypto/aes/arch/x86/aes_via.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/crypto/aes/arch/x86/aes_via.c diff -u src/sys/crypto/aes/arch/x86/aes_via.c:1.5 src/sys/crypto/aes/arch/x86/aes_via.c:1.6 --- src/sys/crypto/aes/arch/x86/aes_via.c:1.5 Sat Jul 25 22:31:32 2020 +++ src/sys/crypto/aes/arch/x86/aes_via.c Tue Jul 28 14:01:35 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: aes_via.c,v 1.5 2020/07/25 22:31:32 riastradh Exp $ */ +/* $NetBSD: aes_via.c,v 1.6 2020/07/28 14:01:35 riastradh Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: aes_via.c,v 1.5 2020/07/25 22:31:32 riastradh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: aes_via.c,v 1.6 2020/07/28 14:01:35 riastradh Exp $"); #ifdef _KERNEL #include <sys/types.h> @@ -739,6 +739,7 @@ aesvia_ccm_enc1(const struct aesenc *enc authctr = authctrbuf; ccmenc_unaligned_evcnt.ev_count++; } else { + authctr = authctr0; ccmenc_aligned_evcnt.ev_count++; } c0 = le32dec(authctr0 + 16 + 4*0); @@ -812,6 +813,7 @@ aesvia_ccm_dec1(const struct aesenc *enc le32enc(authctr + 16 + 4*2, c2); ccmdec_unaligned_evcnt.ev_count++; } else { + authctr = authctr0; ccmdec_aligned_evcnt.ev_count++; }