diff options
author | beck <> | 2001-08-01 19:51:17 +0000 |
---|---|---|
committer | beck <> | 2001-08-01 19:51:17 +0000 |
commit | 4b790f68539c49ef91f5e82506c2624900c92106 (patch) | |
tree | d14ff9f79630cb04ad006cd2730646f44f62d786 /src/lib/libcrypto/evp | |
parent | edbfd6c7e91e15e92ef0df548474ac76b6dddca0 (diff) | |
download | openbsd-4b790f68539c49ef91f5e82506c2624900c92106.tar.gz openbsd-4b790f68539c49ef91f5e82506c2624900c92106.tar.bz2 openbsd-4b790f68539c49ef91f5e82506c2624900c92106.zip |
merge openssl 0.9.6b-engine
Note that this is a maintenence release, API's appear *not* to have changed.
As such, I have only increased the minor number on these libraries
Diffstat (limited to 'src/lib/libcrypto/evp')
-rw-r--r-- | src/lib/libcrypto/evp/e_bf.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp_key.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/evp/e_bf.c b/src/lib/libcrypto/evp/e_bf.c index 72047f64da..53559b0b65 100644 --- a/src/lib/libcrypto/evp/e_bf.c +++ b/src/lib/libcrypto/evp/e_bf.c | |||
@@ -67,7 +67,7 @@ static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
67 | const unsigned char *iv, int enc); | 67 | const unsigned char *iv, int enc); |
68 | 68 | ||
69 | IMPLEMENT_BLOCK_CIPHER(bf, bf_ks, BF, bf_ks, NID_bf, 8, 16, 8, | 69 | IMPLEMENT_BLOCK_CIPHER(bf, bf_ks, BF, bf_ks, NID_bf, 8, 16, 8, |
70 | 0, bf_init_key, NULL, | 70 | EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL, |
71 | EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL) | 71 | EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL) |
72 | 72 | ||
73 | static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 73 | static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 76d417b44a..fd43127092 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -553,9 +553,9 @@ int EVP_read_pw_string(char *buf,int length,const char *prompt,int verify); | |||
553 | void EVP_set_pw_prompt(char *prompt); | 553 | void EVP_set_pw_prompt(char *prompt); |
554 | char * EVP_get_pw_prompt(void); | 554 | char * EVP_get_pw_prompt(void); |
555 | 555 | ||
556 | int EVP_BytesToKey(const EVP_CIPHER *type,EVP_MD *md,unsigned char *salt, | 556 | int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, |
557 | unsigned char *data, int datal, int count, | 557 | const unsigned char *salt, const unsigned char *data, int datal, |
558 | unsigned char *key,unsigned char *iv); | 558 | int count, unsigned char *key, unsigned char *iv); |
559 | 559 | ||
560 | int EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, | 560 | int EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type, |
561 | unsigned char *key, unsigned char *iv); | 561 | unsigned char *key, unsigned char *iv); |
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 09b72bf4bd..e7434ef9b2 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c | |||
@@ -95,9 +95,9 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify) | |||
95 | #endif | 95 | #endif |
96 | } | 96 | } |
97 | 97 | ||
98 | int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt, | 98 | int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, |
99 | unsigned char *data, int datal, int count, unsigned char *key, | 99 | const unsigned char *salt, const unsigned char *data, int datal, |
100 | unsigned char *iv) | 100 | int count, unsigned char *key, unsigned char *iv) |
101 | { | 101 | { |
102 | EVP_MD_CTX c; | 102 | EVP_MD_CTX c; |
103 | unsigned char md_buf[EVP_MAX_MD_SIZE]; | 103 | unsigned char md_buf[EVP_MAX_MD_SIZE]; |