From 11bb39ecf6e58a5e44fc8043004b3f455f30b8fe Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Wed, 7 Nov 2018 20:00:29 -0600
Subject: Rediffed patches for merge fuzz

---
 patches/aeadtest.c.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'patches/aeadtest.c.patch')

diff --git a/patches/aeadtest.c.patch b/patches/aeadtest.c.patch
index 09838bc..a7b3fca 100644
--- a/patches/aeadtest.c.patch
+++ b/patches/aeadtest.c.patch
@@ -1,9 +1,9 @@
---- tests/aeadtest.c.orig	2016-10-18 17:03:33.845870889 +0900
-+++ tests/aeadtest.c	2016-10-18 17:11:19.880841283 +0900
+--- tests/aeadtest.c.orig	2018-07-24 21:59:17.000000000 -0500
++++ tests/aeadtest.c	2018-11-07 18:44:43.000000000 -0600
 @@ -76,6 +76,12 @@
- 
+
  #define BUF_MAX 1024
- 
+
 +#ifdef _MSC_VER
 +#ifdef IN
 +#undef IN
-- 
cgit v1.2.3-55-g6feb