diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
| commit | 367b2622e0527401666a65476f4111fdda2e3c12 (patch) | |
| tree | dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/evp/p_seal.c | |
| parent | ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff) | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/evp/p_seal.c')
| -rw-r--r-- | lib/libcrypto/evp/p_seal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/p_seal.c b/lib/libcrypto/evp/p_seal.c index 8cc8fcb0bd0..d8324526e74 100644 --- a/lib/libcrypto/evp/p_seal.c +++ b/lib/libcrypto/evp/p_seal.c @@ -87,7 +87,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek for (i=0; i<npubk; i++) { - ekl[i]=EVP_PKEY_encrypt(ek[i],key,EVP_CIPHER_CTX_key_length(ctx), + ekl[i]=EVP_PKEY_encrypt_old(ek[i],key,EVP_CIPHER_CTX_key_length(ctx), pubk[i]); if (ekl[i] <= 0) return(-1); } |