Fixed openssl=no build issues (#38)

contrib/win32/openssh/config.h.vs

@@ -876,7 +876,7 @@
 /* #undef HAVE_SET_ID */
 
 /* Define to 1 if you have the `SHA256_Update' function. */
-#define HAVE_SHA256_UPDATE 1
+/* #undef HAVE_SHA256_UPDATE */
 
 /* Define to 1 if you have the <sha2.h> header file. */
 /* #undef HAVE_SHA2_H */

contrib/win32/openssh/libssh.vcxproj

@@ -194,7 +194,7 @@
       <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)digest-libc.c">
-      <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="$(UseOpenSSL)==true">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)dispatch.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)dns.c" />
@@ -285,7 +285,9 @@
     <ClCompile Include="$(OpenSSH-Src-Path)sandbox-pledge.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)utf8.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\ttymodes_windows.c" />
-    <ClCompile Include="..\..\..\digest-openssl.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)digest-openssl.c">
+      <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(OpenSSH-Src-Path)crypto-wrap.h" />

contrib/win32/win32compat/misc.c

@@ -614,15 +614,6 @@ w32_mkdir(const char *path_utf8, unsigned short mode) {
 	return returnStatus;
 }
 
-void
-getrnd(u_char *s, size_t len) {
-	HCRYPTPROV hProvider;
-	if (CryptAcquireContextW(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT) == FALSE ||
-	    CryptGenRandom(hProvider, len, s) == FALSE ||
-	    CryptReleaseContext(hProvider, 0) == FALSE)
-		DebugBreak();
-}
-
 int
 w32_stat(const char *path, struct w32_stat *buf) {
 	return fileio_stat(sanitized_path(path), (struct _stat64*)buf);

openbsd-compat/arc4random.c

@@ -78,6 +78,18 @@ _rs_init(u_char *buf, size_t n)
 }
 
 #ifndef WITH_OPENSSL
+#ifdef WINDOWS
+#include <Wincrypt.h>
+static void
+getrnd(u_char *s, size_t len) {
+	HCRYPTPROV hProvider;
+	if (CryptAcquireContextW(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT) == FALSE ||
+		CryptGenRandom(hProvider, len, s) == FALSE ||
+		CryptReleaseContext(hProvider, 0) == FALSE)
+		DebugBreak();
+}
+
+#else /* !WINDOWS */
 #define SSH_RANDOM_DEV "/dev/urandom"
 /* XXX use getrandom() if supported on Linux */
 static void
@@ -101,6 +113,7 @@ getrnd(u_char *s, size_t len)
 	}
 	close(fd);
 }
+#endif /* !WINDOWS */
 #endif
 
 static void