- Fixes to auth-skey to enable it to use the standard OpenSSL libraries

diff --git a/ChangeLog b/ChangeLog
index 5d8aed4716b7d6b72c9ce560bd7583e887877003..e96dfb803003477f3081330225fe0ba43c5f2f45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+20000110
+ - Fixes to auth-skey to enable it to use the standard OpenSSL libraries
+
 20000107
  - New config.sub and config.guess to fix problems on SCO. Supplied
    by Gary E. Miller <gem@rellim.com>
  - SCO build fix from Gary E. Miller <gem@rellim.com>
+ - Released 1.2.1pre25
 
 20000106
  - Documentation update & cleanup

diff --git a/auth-skey.c b/auth-skey.c
index 8f4779820d1cd39768f1820128fe2c027ce9a136..d7d8422f17a794250b4c8175f18cbe527150d14d 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -7,10 +7,10 @@ RCSID("$Id$");
 #include "packet.h"
 
 #ifdef HAVE_OPENSSL
-#include <openssl/sha1.h>
+#include <openssl/sha.h>
 #endif
 #ifdef HAVE_SSL
-#include <ssl/sha1.h>
+#include <ssl/sha.h>
 #endif
 
 /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */
@@ -79,8 +79,9 @@ skey_fake_keyinfo(char *username)
        static char skeyprompt[SKEY_MAX_CHALLENGE+1];
        char *secret = NULL;
        size_t secretlen = 0;
-       SHA1_CTX ctx;
+       SHA_CTX ctx;
        char *p, *u;
+       char md[SHA_DIGEST_LENGTH];
 
        /*
         * Base first 4 chars of seed on hostname.
@@ -97,11 +98,16 @@ skey_fake_keyinfo(char *username)
        pbuf[4] = '\0';
 
        /* Hash the username if possible */
-       if ((up = SHA1Data(username, strlen(username), NULL)) != NULL) {
+       up = malloc(SHA_DIGEST_LENGTH);
+       if (up != NULL) {
                struct stat sb;
                time_t t;
                int fd;
 
+               SHA1_Init(&ctx);
+               SHA1_Update(&ctx, username, strlen(username));
+               SHA1_End(&ctx, up);
+
                /* Collapse the hash */
                ptr = hash_collapse(up);
                memset(up, 0, strlen(up));
@@ -131,18 +137,18 @@ skey_fake_keyinfo(char *username)
        /* Put that in your pipe and smoke it */
        if (flg == 0) {
                /* Hash secret value with username */
-               SHA1Init(&ctx);
-               SHA1Update(&ctx, secret, secretlen);
-               SHA1Update(&ctx, username, strlen(username));
-               SHA1End(&ctx, up);
+               SHA1_Init(&ctx);
+               SHA1_Update(&ctx, secret, secretlen);
+               SHA1_Update(&ctx, username, strlen(username));
+               SHA1_End(&ctx, up);
                
                /* Zero out */
                memset(secret, 0, secretlen);
 
                /* Now hash the hash */
-               SHA1Init(&ctx);
-               SHA1Update(&ctx, up, strlen(up));
-               SHA1End(&ctx, up);
+               SHA1_Init(&ctx);
+               SHA1_Update(&ctx, up, strlen(up));
+               SHA1_End(&ctx, up);
                
                ptr = hash_collapse(up + 4);
                
@@ -155,7 +161,7 @@ skey_fake_keyinfo(char *username)
                /* Sequence number */
                ptr = ((up[2] + up[3]) % 99) + 1;
 
-               memset(up, 0, 20); /* SHA1 specific */
+               memset(up, 0, SHA_DIGEST_LENGTH); /* SHA1 specific */
                free(up);
 
                (void)snprintf(skeyprompt, sizeof skeyprompt,