1 files changed, 36 insertions, 42 deletions

diff --git a/src/lib/libssl/src/fips/sha1/fips_sha1_selftest.c b/src/lib/libcrypto/ui/ui_util.c
index 248539acb0..5d9760bb7b 100644
--- a/src/lib/libssl/src/fips/sha1/fips_sha1_selftest.c
+++ b/src/lib/libcrypto/ui/ui_util.c
@@ -1,5 +1,6 @@
+/* crypto/ui/ui_util.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -44,54 +45,47 @@
  * 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
  *
  */
 
 #include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/sha.h>
-
-#ifdef OPENSSL_FIPS
-static char *test[]=
-    {
-    "",
-    "abc",
-    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-    NULL,
-    };
+#include "ui_locl.h"
 
-static unsigned char ret[][SHA_DIGEST_LENGTH]=
-    {
-    { 0xda,0x39,0xa3,0xee,0x5e,0x6b,0x4b,0x0d,0x32,0x55,
-      0xbf,0xef,0x95,0x60,0x18,0x90,0xaf,0xd8,0x07,0x09 },
-    { 0xa9,0x99,0x3e,0x36,0x47,0x06,0x81,0x6a,0xba,0x3e,
-      0x25,0x71,0x78,0x50,0xc2,0x6c,0x9c,0xd0,0xd8,0x9d },
-    { 0x84,0x98,0x3e,0x44,0x1c,0x3b,0xd2,0x6e,0xba,0xae,
-      0x4a,0xa1,0xf9,0x51,0x29,0xe5,0xe5,0x46,0x70,0xf1 },
-    };
-
-void FIPS_corrupt_sha1()
-    {
-    ret[0][0]++;
-    }
+int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
+        {
+        char buff[BUFSIZ];
+        int ret;
 
-int FIPS_selftest_sha1()
-    {
-    int n;
+        ret=UI_UTIL_read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify);
+        OPENSSL_cleanse(buff,BUFSIZ);
+        return(ret);
+        }
 
-    for(n=0 ; test[n] ; ++n)
+int UI_UTIL_read_pw(char *buf,char *buff,int size,const char *prompt,int verify)
         {
-        unsigned char md[SHA_DIGEST_LENGTH];
+        int ok = 0;
+        UI *ui;
 
-        SHA1((unsigned char*)test[n],strlen(test[n]),md);
-        if(memcmp(md,ret[n],sizeof md))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA1,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    return 1;
-    }
+        if (size < 1)
+                return -1;
 
-#endif
+        ui = UI_new();
+        if (ui)
+                {
+                ok = UI_add_input_string(ui,prompt,0,buf,0,size-1);
+                if (ok >= 0 && verify)
+                        ok = UI_add_verify_string(ui,prompt,0,buff,0,size-1,
+                                buf);
+                if (ok >= 0)
+                        ok=UI_process(ui);
+                UI_free(ui);
+                }
+        if (ok > 0)
+                ok = 0;
+        return(ok);
+        }