projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify (non-)blocking behavior of EGD socket interface used by RAND_egd().
[oweals/openssl.git]
/
doc
/
crypto
/
EVP_EncryptInit.pod
diff --git
a/doc/crypto/EVP_EncryptInit.pod
b/doc/crypto/EVP_EncryptInit.pod
index 75cceb1ca264ea7af9e695ba4d8c39a717ff5497..8271d3dfc417a2126f9fc193e545b112e19c05ff 100644
(file)
--- a/
doc/crypto/EVP_EncryptInit.pod
+++ b/
doc/crypto/EVP_EncryptInit.pod
@@
-22,7
+22,7
@@
EVP_CIPHER_CTX_set_padding - EVP cipher routines
#include <openssl/evp.h>
#include <openssl/evp.h>
-
int
EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
+
void
EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
ENGINE *impl, unsigned char *key, unsigned char *iv);
int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
ENGINE *impl, unsigned char *key, unsigned char *iv);
@@
-236,8
+236,8
@@
RC5 can be set.
=head1 RETURN VALUES
=head1 RETURN VALUES
-EVP_
CIPHER_CTX_init, EVP_EncryptInit_ex(), EVP_EncryptUpdate() and
-
EVP_EncryptFinal_ex()
return 1 for success and 0 for failure.
+EVP_
EncryptInit_ex(), EVP_EncryptUpdate() and EVP_EncryptFinal_ex()
+return 1 for success and 0 for failure.
EVP_DecryptInit_ex() and EVP_DecryptUpdate() return 1 for success and 0 for failure.
EVP_DecryptFinal_ex() returns 0 if the decrypt failed or 1 for success.
EVP_DecryptInit_ex() and EVP_DecryptUpdate() return 1 for success and 0 for failure.
EVP_DecryptFinal_ex() returns 0 if the decrypt failed or 1 for success.
@@
-419,7
+419,7
@@
Encrypt a string using blowfish:
EVP_CIPHER_CTX ctx;
FILE *out;
EVP_CIPHER_CTX_init(&ctx);
EVP_CIPHER_CTX ctx;
FILE *out;
EVP_CIPHER_CTX_init(&ctx);
- EVP_EncryptInit_ex(&ctx,
NULL, EVP_bf_cbc()
, key, iv);
+ EVP_EncryptInit_ex(&ctx,
EVP_bf_cbc(), NULL
, key, iv);
if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, strlen(intext)))
{
if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, strlen(intext)))
{
@@
-479,6
+479,7
@@
General encryption, decryption function example using FILE I/O and RC2 with an
if(!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf, inlen))
{
/* Error */
if(!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf, inlen))
{
/* Error */
+ EVP_CIPHER_CTX_cleanup(&ctx);
return 0;
}
fwrite(outbuf, 1, outlen, out);
return 0;
}
fwrite(outbuf, 1, outlen, out);
@@
-486,6
+487,7
@@
General encryption, decryption function example using FILE I/O and RC2 with an
if(!EVP_CipherFinal_ex(&ctx, outbuf, &outlen))
{
/* Error */
if(!EVP_CipherFinal_ex(&ctx, outbuf, &outlen))
{
/* Error */
+ EVP_CIPHER_CTX_cleanup(&ctx);
return 0;
}
fwrite(outbuf, 1, outlen, out);
return 0;
}
fwrite(outbuf, 1, outlen, out);