More multibyte character support.

[openssl.git] / crypto / evp / evp_key.c

diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 0aa1dbb65a78db96441fe4e62c28495e4e329765..21eda418bc9d1c2b71d661896c4f7c7ae44d7ac1 100644 (file)
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -1,5 +1,5 @@
 /* crypto/evp/evp_key.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,15 +58,14 @@
 
 #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>
 
 /* 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';
@@ -74,7 +73,7 @@ char *prompt;
                strncpy(prompt_string,prompt,79);
        }
 
-char *EVP_get_pw_prompt()
+char *EVP_get_pw_prompt(void)
        {
        if (prompt_string[0] == '\0')
                return(NULL);
@@ -82,26 +81,20 @@ char *EVP_get_pw_prompt()
                return(prompt_string);
        }
 
-int EVP_read_pw_string(buf,len,prompt,verify)
-char *buf;
-int len;
-char *prompt;
-int verify;
+#ifdef NO_DES
+int des_read_pw_string(char *buf,int len,const char *prompt,int verify);
+#endif
+
+int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
        {
        if ((prompt == NULL) && (prompt_string[0] != '\0'))
                prompt=prompt_string;
        return(des_read_pw_string(buf,len,prompt,verify));
        }
 
-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, EVP_MD *md, unsigned char *salt,
+            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];
@@ -158,6 +151,6 @@ unsigned char *iv;
                }
        memset(&c,0,sizeof(c));
        memset(&(md_buf[0]),0,EVP_MAX_MD_SIZE);
-       return(nkey);
+       return(type->key_len);
        }