diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2002-05-21 01:49:12 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2002-05-21 01:49:12 +0000 |
| commit | 9b2a9967579b0f80efba45c01bb80b222b8d45f2 (patch) | |
| tree | ded50191de034a4f2909459a26179e9d81f42c1a /lib/libcrypto/evp/evp.h | |
| parent | 8d68b65a3eb5baf87a0f9ceccd66a839a1a81252 (diff) | |
Merge openssl-0.9.7-stable-SNAP-20020519
Diffstat (limited to 'lib/libcrypto/evp/evp.h')
| -rw-r--r-- | lib/libcrypto/evp/evp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h index 915fe623412..0d870d60beb 100644 --- a/lib/libcrypto/evp/evp.h +++ b/lib/libcrypto/evp/evp.h @@ -184,7 +184,7 @@ typedef struct evp_pkey_md_st EVP_rsa_octet_string(),EVP_mdc2()) #define EVP_dsa_sha() \ EVP_PKEY_MD_add(NID_dsaWithSHA,\ - EVP_dsa(),EVP_mdc2()) + EVP_dsa(),EVP_sha()) #define EVP_dsa_sha1() \ EVP_PKEY_MD_add(NID_dsaWithSHA1,\ EVP_dsa(),EVP_sha1()) @@ -525,7 +525,7 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek, int *ekl, unsigned char *iv,EVP_PKEY **pubk, int npubk); -void EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl); +int EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl); void EVP_EncodeInit(EVP_ENCODE_CTX *ctx); void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx,unsigned char *out, |