summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/pkcs12.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2001-03-09 02:51:02 +0000
committerDr. Stephen Henson <steve@openssl.org>2001-03-09 02:51:02 +0000
commit135883505078a868349e0a3c24514099e3cb2dac (patch)
treea989ffbf4b5b68e456c7de239ec6cbbeb0ea348e /crypto/pkcs12/pkcs12.h
parent754d494bef083e7f4c8733e7142555726ca7efef (diff)
Change the EVP_somecipher() and EVP_somedigest()
functions to return constant EVP_MD and EVP_CIPHER pointers. Update docs.
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
-rw-r--r--crypto/pkcs12/pkcs12.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 1531ee7926..01c20ddc6e 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -220,16 +220,16 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
unsigned char *out, const EVP_MD *md_type);
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
- ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md_type,
+ ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md_type,
int en_de);
int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
unsigned char *mac, unsigned int *maclen);
int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
unsigned char *salt, int saltlen, int iter,
- EVP_MD *md_type);
+ const EVP_MD *md_type);
int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
- int saltlen, EVP_MD *md_type);
+ int saltlen, const EVP_MD *md_type);
unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen);
char *uni2asc(unsigned char *uni, int unilen);