1 files changed, 36 insertions, 31 deletions

diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index dafa686f64..4271393069 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -58,23 +58,26 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/x509.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/ui.h>
 
 /* should be init to zeros. */
 static char prompt_string[80];
 
-void EVP_set_pw_prompt(prompt)
-char *prompt;
+void EVP_set_pw_prompt(char *prompt)
         {
         if (prompt == NULL)
                 prompt_string[0]='\0';
         else
+                {
                 strncpy(prompt_string,prompt,79);
+                prompt_string[79]='\0';
+                }
         }
 
-char *EVP_get_pw_prompt()
+char *EVP_get_pw_prompt(void)
         {
         if (prompt_string[0] == '\0')
                 return(NULL);
@@ -82,30 +85,31 @@ char *EVP_get_pw_prompt()
                 return(prompt_string);
         }
 
-#ifdef NO_DES
-int des_read_pw_string(char *buf,int len,char *prompt,int verify);
-#endif
-
-int EVP_read_pw_string(buf,len,prompt,verify)
-char *buf;
-int len;
-char *prompt;
-int verify;
+/* For historical reasons, the standard function for reading passwords is
+ * in the DES library -- if someone ever wants to disable DES,
+ * this function will fail */
+int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
         {
+        int ret;
+        char buff[BUFSIZ];
+        UI *ui;
+
         if ((prompt == NULL) && (prompt_string[0] != '\0'))
                 prompt=prompt_string;
-        return(des_read_pw_string(buf,len,prompt,verify));
+        ui = UI_new();
+        UI_add_input_string(ui,prompt,0,buf,0,(len>=BUFSIZ)?BUFSIZ-1:len);
+        if (verify)
+                UI_add_verify_string(ui,prompt,0,
+                        buff,0,(len>=BUFSIZ)?BUFSIZ-1:len,buf);
+        ret = UI_process(ui);
+        UI_free(ui);
+        memset(buff,0,BUFSIZ);
+        return ret;
         }
 
-int EVP_BytesToKey(type,md,salt,data,datal,count,key,iv)
-EVP_CIPHER *type;
-EVP_MD *md;
-unsigned char *salt;
-unsigned char *data;
-int datal;
-int count;
-unsigned char *key;
-unsigned char *iv;
+int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, 
+             const unsigned char *salt, const unsigned char *data, int datal,
+             int count, unsigned char *key, unsigned char *iv)
         {
         EVP_MD_CTX c;
         unsigned char md_buf[EVP_MAX_MD_SIZE];
@@ -117,21 +121,22 @@ unsigned char *iv;
 
         if (data == NULL) return(nkey);
 
+        EVP_MD_CTX_init(&c);
         for (;;)
                 {
-                EVP_DigestInit(&c,md);
+                EVP_DigestInit_ex(&c,md, NULL);
                 if (addmd++)
                         EVP_DigestUpdate(&c,&(md_buf[0]),mds);
                 EVP_DigestUpdate(&c,data,datal);
                 if (salt != NULL)
-                        EVP_DigestUpdate(&c,salt,8);
-                EVP_DigestFinal(&c,&(md_buf[0]),&mds);
+                        EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN);
+                EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
 
                 for (i=1; i<(unsigned int)count; i++)
                         {
-                        EVP_DigestInit(&c,md);
+                        EVP_DigestInit_ex(&c,md, NULL);
                         EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                        EVP_DigestFinal(&c,&(md_buf[0]),&mds);
+                        EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
                         }
                 i=0;
                 if (nkey)
@@ -160,7 +165,7 @@ unsigned char *iv;
                         }
                 if ((nkey == 0) && (niv == 0)) break;
                 }
-        memset(&c,0,sizeof(c));
+        EVP_MD_CTX_cleanup(&c);
         memset(&(md_buf[0]),0,EVP_MAX_MD_SIZE);
         return(type->key_len);
         }