Merge pull request #661 from tgauth/fix-commit-history

tgauth · web-flow · commit e46452f6477c · 2023-02-10T15:15:35.000-05:00
Fix commit history
diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs
@@ -1768,5 +1768,3 @@
 #define HAVE_EVP_PKEY_GET0_RSA 1
 #define HAVE_EVP_MD_CTX_NEW 1
 #define HAVE_EVP_MD_CTX_FREE 1
-
-
diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c
@@ -289,4 +289,4 @@ arc4random_buf(void *_buf, size_t n)
 	}
 	explicit_bzero(&r, sizeof(r));
 }
-#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */
+#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */

Original file line number	Diff line number	Diff line change
`@@ -289,4 +289,4 @@ arc4random_buf(void *_buf, size_t n)`
`289`	`289`	`}`
`290`	`290`	`explicit_bzero(&r, sizeof(r));`
`291`	`291`	`}`
`292`		`-#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */`
	`292`	`+#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */`