From: Lutz Jänicke Date: Sat, 14 Apr 2001 14:48:44 +0000 (+0000) Subject: Don't make half work when constifying... X-Git-Tag: OpenSSL_0_9_6b~40 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b089e64654424b5ede5e5f72897e0e79f36756d9;p=oweals%2Fopenssl.git Don't make half work when constifying... --- diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 0d71c548a5..0f27df4603 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -555,7 +555,7 @@ void EVP_set_pw_prompt(char *prompt); char * EVP_get_pw_prompt(void); int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, - const unsigned char *salt, unsigned char *data, int datal, + const unsigned char *salt, const unsigned char *data, int datal, int count, unsigned char *key, unsigned char *iv); int EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index f8710bf329..e7434ef9b2 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -96,7 +96,7 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) } int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, - const unsigned char *salt, unsigned char *data, int datal, + const unsigned char *salt, const unsigned char *data, int datal, int count, unsigned char *key, unsigned char *iv) { EVP_MD_CTX c;