diff --git a/contrib/opie/libopie/hash.c b/contrib/opie/libopie/hash.c
index eab170618bbd..0edbdd1bc9c7 100644
--- a/contrib/opie/libopie/hash.c
+++ b/contrib/opie/libopie/hash.c
@@ -1,70 +1,67 @@
 /* hash.c: The opiehash() library function.
 
 %%% copyright-cmetz-96
 This software is Copyright 1996-1998 by Craig Metz, All Rights Reserved.
 The Inner Net License Version 2 applies to this software.
 You should have received a copy of the license with this software. If
 you didn't get a copy, you may request one from <license@inner.net>.
 
         History:
 
 	Updated by cmetz for OPIE 2.31. Added SHA support (which may
               not be correct). Backed out previous optimizations as
               they killed thread-safety.
         Created by cmetz for OPIE 2.3 using the old hash.c as a guide.
 
 $FreeBSD$
 */
 
 #include "opie_cfg.h"
-#if 0
-#include "sha.h"
-#endif /* 0 */
 #include "opie.h"
 
+#include <sha.h>
 #include <md4.h>
 #include <md5.h>
 
 VOIDRET opiehash FUNCTION((x, algorithm), VOIDPTR x AND unsigned algorithm)
 {
   UINT4 *results = (UINT4 *)x;
 
   switch(algorithm) {
-#if 0
     case 3:
       {
       SHA_CTX sha;
-      SHAInit(&sha);
-      SHAUpdate(&sha, (unsigned char *)x, 8);
-      SHAFinal(&sha);
-      results[0] = sha.buffer[0] ^ sha.buffer[2] ^ sha.buffer[4];
-      results[1] = sha.buffer[1] ^ sha.buffer[3];
+      UINT4 digest[5];
+      SHA1_Init(&sha);
+      SHA1_Update(&sha, (unsigned char *)x, 8);
+      SHA1_Final((unsigned char *)digest, &sha);
+      results[0] = digest[0] ^ digest[2] ^ digest[4];
+      results[1] = digest[1] ^ digest[3];
       };
       break;
-#endif /* 0 */
     case 4:
       {
       MD4_CTX mdx;
       UINT4 mdx_tmp[4];
 
       MD4Init(&mdx);
       MD4Update(&mdx, (unsigned char *)x, 8);
       MD4Final((unsigned char *)mdx_tmp, &mdx);
       results[0] = mdx_tmp[0] ^ mdx_tmp[2];
       results[1] = mdx_tmp[1] ^ mdx_tmp[3];
       };
       break;
     case 5:
       {
       MD5_CTX mdx;
       UINT4 mdx_tmp[4];
 
       MD5Init(&mdx);
       MD5Update(&mdx, (unsigned char *)x, 8);
       MD5Final((unsigned char *)mdx_tmp, &mdx);
       results[0] = mdx_tmp[0] ^ mdx_tmp[2];
       results[1] = mdx_tmp[1] ^ mdx_tmp[3];
       };
       break;
   }
 }
diff --git a/contrib/opie/libopie/hashlen.c b/contrib/opie/libopie/hashlen.c
index 74f1fc63b53a..66f7d2cd1443 100644
--- a/contrib/opie/libopie/hashlen.c
+++ b/contrib/opie/libopie/hashlen.c
@@ -1,59 +1,58 @@
 /* hashlen.c: The opiehashlen() library function.
 
 %%% copyright-cmetz-96
 This software is Copyright 1996-1998 by Craig Metz, All Rights Reserved.
 The Inner Net License Version 2 applies to this software.
 You should have received a copy of the license with this software. If
 you didn't get a copy, you may request one from <license@inner.net>.
 
         History:
 
 	Created by cmetz for OPIE 2.3.
 
 $FreeBSD$
 */
 
 #include "opie_cfg.h"
 #include "opie.h"
 
+#include <sha.h>
 #include <md4.h>
 #include <md5.h>
 
 VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND VOIDPTR out AND int n)
 {
   UINT4 *results = (UINT4 *)out;
   UINT4 mdx_tmp[4];
-#if 0
-  SHA_INFO sha;
-#endif /* 0 */
 
   switch(algorithm) {
-#if 0
-    case 3:
-      sha_init(&sha);
-      sha_update(&sha, (BYTE *)in, n);
-      sha_final(&sha);
-      results[0] = sha.digest[0] ^ sha.digest[2] ^ sha.digest[4];
-      results[1] = sha.digest[1] ^ sha.digest[3] ^ sha.digest[5];
+    case 3: {
+      SHA_CTX sha;
+      UINT4 digest[5];
+      SHA1_Init(&sha);
+      SHA1_Update(&sha, (unsigned char *)in, n);
+      SHA1_Final((unsigned char *)digest, &sha);
+      results[0] = digest[0] ^ digest[2] ^ digest[4];
+      results[1] = digest[1] ^ digest[3];
       break;
-#endif /* 0 */
+    }
     case 4: {
       MD4_CTX mdx;
       MD4Init(&mdx);
       MD4Update(&mdx, (unsigned char *)in, n);
       MD4Final((unsigned char *)mdx_tmp, &mdx);
       results[0] = mdx_tmp[0] ^ mdx_tmp[2];
       results[1] = mdx_tmp[1] ^ mdx_tmp[3];
       break;
     }
     case 5: {
       MD5_CTX mdx;
       MD5Init(&mdx);
       MD5Update(&mdx, (unsigned char *)in, n);
       MD5Final((unsigned char *)mdx_tmp, &mdx);
       results[0] = mdx_tmp[0] ^ mdx_tmp[2];
       results[1] = mdx_tmp[1] ^ mdx_tmp[3];
       break;
     }
   }
 }