diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/doc/EVP_EncryptInit.pod | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/doc/EVP_EncryptInit.pod')
| -rw-r--r-- | src/lib/libcrypto/doc/EVP_EncryptInit.pod | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/doc/EVP_EncryptInit.pod b/src/lib/libcrypto/doc/EVP_EncryptInit.pod index 40e525dd56..8271d3dfc4 100644 --- a/src/lib/libcrypto/doc/EVP_EncryptInit.pod +++ b/src/lib/libcrypto/doc/EVP_EncryptInit.pod | |||
| @@ -22,7 +22,7 @@ EVP_CIPHER_CTX_set_padding - EVP cipher routines | |||
| 22 | 22 | ||
| 23 | #include <openssl/evp.h> | 23 | #include <openssl/evp.h> |
| 24 | 24 | ||
| 25 | int EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); | 25 | void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); |
| 26 | 26 | ||
| 27 | int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, | 27 | int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, |
| 28 | ENGINE *impl, unsigned char *key, unsigned char *iv); | 28 | ENGINE *impl, unsigned char *key, unsigned char *iv); |
| @@ -236,8 +236,8 @@ RC5 can be set. | |||
| 236 | 236 | ||
| 237 | =head1 RETURN VALUES | 237 | =head1 RETURN VALUES |
| 238 | 238 | ||
| 239 | EVP_CIPHER_CTX_init, EVP_EncryptInit_ex(), EVP_EncryptUpdate() and | 239 | EVP_EncryptInit_ex(), EVP_EncryptUpdate() and EVP_EncryptFinal_ex() |
| 240 | EVP_EncryptFinal_ex() return 1 for success and 0 for failure. | 240 | return 1 for success and 0 for failure. |
| 241 | 241 | ||
| 242 | EVP_DecryptInit_ex() and EVP_DecryptUpdate() return 1 for success and 0 for failure. | 242 | EVP_DecryptInit_ex() and EVP_DecryptUpdate() return 1 for success and 0 for failure. |
| 243 | EVP_DecryptFinal_ex() returns 0 if the decrypt failed or 1 for success. | 243 | EVP_DecryptFinal_ex() returns 0 if the decrypt failed or 1 for success. |