diff options
| author | Ben Laurie <ben@openssl.org> | 2006-08-28 17:01:04 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2006-08-28 17:01:04 +0000 |
| commit | 777c47acbeecf9602cc465864c9f5f2c609c989d (patch) | |
| tree | e35a78fad59225fc817f609748c8ff2b9e9b2afe /crypto/evp | |
| parent | 5776c3c4c6663cb1498e83ed20894af4b59c78aa (diff) | |
Make things static that should be. Declare stuff in headers that should be.
Fix warnings.
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/evp.h | 4 | ||||
| -rw-r--r-- | crypto/evp/m_sigver.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 585cb17d1d..f89dedac9e 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -876,6 +876,10 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, int keylen, unsigned char *out); +int PKCS5_PBKDF2_HMAC(const char *pass, int passlen, + const unsigned char *salt, int saltlen, int iter, + const EVP_MD *digest, + int keylen, unsigned char *out); int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de); diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index 95382118b2..fd4fe349c5 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -62,8 +62,9 @@ #include <openssl/objects.h> #include <openssl/x509.h> -int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, - const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey, int ver) +static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, + const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey, + int ver) { if (!EVP_DigestInit_ex(ctx, type, e)) return 0; |