- djm@cvs.openbsd.org 2014/01/09 23:20:00

     [digest.c digest.h hostfile.c kex.c kex.h kexc25519.c kexc25519c.c]
     [kexc25519s.c kexdh.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c]
     [kexgexs.c key.c key.h roaming_client.c roaming_common.c schnorr.c]
     [schnorr.h ssh-dss.c ssh-ecdsa.c ssh-rsa.c sshconnect2.c]
     Introduce digest API and use it to perform all hashing operations
     rather than calling OpenSSL EVP_Digest* directly. Will make it easier
     to build a reduced-feature OpenSSH without OpenSSL in future;
     feedback, ok markus@

1 files changed, 6 insertions, 8 deletions

diff --git a/roaming_common.c b/roaming_common.c
index 86b3372ef..787bef04a 100644
--- a/roaming_common.c
+++ b/roaming_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roaming_common.c,v 1.11 2013/11/03 10:37:19 djm Exp $ */
+/* $OpenBSD: roaming_common.c,v 1.12 2014/01/09 23:20:00 djm Exp $ */
 /*
  * Copyright (c) 2004-2009 AppGate Network Security AB
  *
@@ -36,6 +36,7 @@
 #include "cipher.h"
 #include "buffer.h"
 #include "roaming.h"
+#include "digest.h"
 
 static size_t out_buf_size = 0;
 static char *out_buf = NULL;
@@ -225,9 +226,7 @@ resend_bytes(int fd, u_int64_t *offset)
 void
 calculate_new_key(u_int64_t *key, u_int64_t cookie, u_int64_t challenge)
 {
-        const EVP_MD *md = EVP_sha1();
-        EVP_MD_CTX ctx;
-        u_char hash[EVP_MAX_MD_SIZE];
+        u_char hash[SSH_DIGEST_MAX_LENGTH];
         Buffer b;
 
         buffer_init(&b);
@@ -235,12 +234,11 @@ calculate_new_key(u_int64_t *key, u_int64_t cookie, u_int64_t challenge)
         buffer_put_int64(&b, cookie);
         buffer_put_int64(&b, challenge);
 
-        EVP_DigestInit(&ctx, md);
-        EVP_DigestUpdate(&ctx, buffer_ptr(&b), buffer_len(&b));
-        EVP_DigestFinal(&ctx, hash, NULL);
+        if (ssh_digest_buffer(SSH_DIGEST_SHA1, &b, hash, sizeof(hash)) != 0)
+                fatal("%s: digest_buffer failed", __func__);
 
         buffer_clear(&b);
-        buffer_append(&b, hash, EVP_MD_size(md));
+        buffer_append(&b, hash, ssh_digest_bytes(SSH_DIGEST_SHA1));
         *key = buffer_get_int64(&b);
         buffer_free(&b);
 }