project: Update for 0.9.1 merge.

Author: Sibras

SMP/SMP.patch

@@ -101,7 +101,7 @@ index a8dfe030..b74cf6dd 100644
  static int _ssh_init(unsigned constructor) {
 
 diff --git a/src/misc.c b/src/misc.c
-index 0c6b570c..c365e62b 100644
+index 8bd378f3..0fabd593 100644
 --- a/src/misc.c
 +++ b/src/misc.c
 @@ -50,9 +50,10 @@
@@ -136,7 +136,7 @@ index 0c6b570c..c365e62b 100644
  }
 
  /* we have read access on file */
-@@ -147,22 +152,26 @@ int gettimeofday(struct timeval *__p, void *__t) {
+@@ -172,22 +177,26 @@ int gettimeofday(struct timeval *__p, void *__t) {
  }
 
  char *ssh_get_local_username(void) {
@@ -166,10 +166,10 @@ index 0c6b570c..c365e62b 100644
 
  int ssh_is_ipaddr_v4(const char *str) {
 diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c
-index 705830c0..8ecbbdde 100644
+index 6e00194a..cadf4ff4 100644
 --- a/src/pki_gcrypt.c
 +++ b/src/pki_gcrypt.c
-@@ -2140,7 +2140,11 @@ ssh_signature pki_do_sign_hash(const ssh_key privkey,
+@@ -2092,7 +2092,11 @@ ssh_signature pki_do_sign_hash(const ssh_key privkey,
                                 size_t hlen,
                                 enum ssh_digest_e hash_type)
  {

SMP/config.h

@@ -82,6 +82,12 @@
 /* Define to 1 if you have gl_flags as a glob_t sturct member */
 /* #undef HAVE_GLOB_GL_FLAGS_MEMBER */
 
+/* Define to 1 if you have OpenSSL with Ed25519 support */
+/* #undef HAVE_OPENSSL_ED25519 */
+
+/* Define to 1 if you have OpenSSL with X25519 support */
+/* #undef HAVE_OPENSSL_X25519 */
+
 /*************************** FUNCTIONS ***************************/
 
 /* Define to 1 if you have the `EVP_aes128_ctr' function. */
@@ -103,10 +109,19 @@
 /* #undef HAVE_OPENSSL_EVP_CIPHER_CTX_NEW */
 
 /* Define to 1 if you have the `EVP_KDF_CTX_new_id' function. */
-/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID 1
+/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
+
+/* Define to 1 if you have the `FIPS_mode' function. */
+/* #undef HAVE_OPENSSL_FIPS_MODE */
+
+/* Define to 1 if you have the `EVP_DigestSign' function. */
+/* #undef HAVE_OPENSSL_EVP_DIGESTSIGN */
+
+/* Define to 1 if you have the `EVP_DigestVerify' function. */
+/* #undef HAVE_OPENSSL_EVP_DIGESTVERIFY */
 
 /* Define to 1 if you have the `OPENSSL_ia32cap_loc' function. */
-/* #undef HAVE_OPENSSL_IA32CAP_LOC 1
+/* #undef HAVE_OPENSSL_IA32CAP_LOC */
 
 /* Define to 1 if you have the `snprintf' function. */
 /* #undef HAVE_SNPRINTF */

SMP/libssh.vcxproj

@@ -136,6 +136,7 @@
     <ClCompile Include="..\src\pki.c" />
     <ClCompile Include="..\src\pki_container_openssh.c" />
     <ClCompile Include="..\src\pki_ed25519.c" />
+    <ClCompile Include="..\src\pki_ed25519_common.c" />
     <ClCompile Include="..\src\pki_gcrypt.c" />
     <ClCompile Include="..\src\poll.c" />
     <ClCompile Include="..\src\scp.c" />

SMP/libssh.vcxproj.filters

@@ -225,6 +225,9 @@
     <ClCompile Include="..\src\token.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pki_ed25519_common.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\libssh\agent.h">