Add support for GNU rx library for those lacking regexp support

[openssh.git] / auth-skey.c

diff --git a/auth-skey.c b/auth-skey.c
index d7d8422f17a794250b4c8175f18cbe527150d14d..1e3cec8602944daf6d4b8bde3b8aa730005c9261 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,26 +1,43 @@
+/*
+ * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "includes.h"
+RCSID("$OpenBSD: auth-skey.c,v 1.8 2000/09/07 20:27:49 deraadt Exp $");
 
 #ifdef SKEY
-RCSID("$Id$");
-
 #include "ssh.h"
 #include "packet.h"
-
-#ifdef HAVE_OPENSSL
 #include <openssl/sha.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/sha.h>
-#endif
 
 /* from %OpenBSD: skeylogin.c,v 1.32 1999/08/16 14:46:56 millert Exp % */
 
-/* 
+/*
  * try skey authentication,
- * return 1 on success, 0 on failure, -1 if skey is not available 
+ * return 1 on success, 0 on failure, -1 if skey is not available
  */
 
-int 
+int
 auth_skey_password(struct passwd * pw, const char *password)
 {
        if (strncasecmp(password, "s/key", 5) == 0) {
@@ -53,18 +70,18 @@ auth_skey_password(struct passwd * pw, const char *password)
  */
 static u_int32_t
 hash_collapse(s)
-        u_char *s;
+       u_char *s;
 {
-        int len, target;
+       int len, target;
        u_int32_t i;
        
        if ((strlen(s) % sizeof(u_int32_t)) == 0)
-               target = strlen(s);    /* Multiple of 4 */
+               target = strlen(s);    /* Multiple of 4 */
        else
                target = strlen(s) - (strlen(s) % sizeof(u_int32_t));
-  
+
        for (i = 0, len = 0; len < target; len += 4)
-               i ^= ROUND(s + len);
+               i ^= ROUND(s + len);
 
        return i;
 }
@@ -81,7 +98,6 @@ skey_fake_keyinfo(char *username)
        size_t secretlen = 0;
        SHA_CTX ctx;
        char *p, *u;
-       char md[SHA_DIGEST_LENGTH];
 
        /*
         * Base first 4 chars of seed on hostname.
@@ -106,7 +122,7 @@ skey_fake_keyinfo(char *username)
 
                SHA1_Init(&ctx);
                SHA1_Update(&ctx, username, strlen(username));
-               SHA1_End(&ctx, up);
+               SHA1_Final(up, &ctx);
 
                /* Collapse the hash */
                ptr = hash_collapse(up);
@@ -140,7 +156,7 @@ skey_fake_keyinfo(char *username)
                SHA1_Init(&ctx);
                SHA1_Update(&ctx, secret, secretlen);
                SHA1_Update(&ctx, username, strlen(username));
-               SHA1_End(&ctx, up);
+               SHA1_Final(up, &ctx);
                
                /* Zero out */
                memset(secret, 0, secretlen);
@@ -148,7 +164,7 @@ skey_fake_keyinfo(char *username)
                /* Now hash the hash */
                SHA1_Init(&ctx);
                SHA1_Update(&ctx, up, strlen(up));
-               SHA1_End(&ctx, up);
+               SHA1_Final(up, &ctx);
                
                ptr = hash_collapse(up + 4);