diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-05-27 12:38:43 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-05-27 12:38:43 +0000 |
commit | be06a9348d83187071270a29aabfe10cc3904f85 (patch) | |
tree | bd19112dbfbaa0b19bd83b1a94e85ad6a794fcdb /crypto/evp/e_ofb_i.c | |
parent | 7f0606016cbbec917b1fe094b84b062e87abe7da (diff) | |
download | openssl-be06a9348d83187071270a29aabfe10cc3904f85.tar.gz |
Second phase of EVP cipher overhaul.
Change functions like EVP_EncryptUpdate() so they now return a
value. These normally have software only implementations
which cannot fail so this was acceptable. However ciphers
can be implemented in hardware and these could return errors.
Diffstat (limited to 'crypto/evp/e_ofb_i.c')
-rw-r--r-- | crypto/evp/e_ofb_i.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/evp/e_ofb_i.c b/crypto/evp/e_ofb_i.c index 7c97cbd7b6..36c14b492e 100644 --- a/crypto/evp/e_ofb_i.c +++ b/crypto/evp/e_ofb_i.c @@ -63,9 +63,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> -static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv,int enc); -static void idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +static int idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl); static EVP_CIPHER i_ofb_cipher= { @@ -87,7 +87,7 @@ EVP_CIPHER *EVP_idea_ofb(void) return(&i_ofb_cipher); } -static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv, int enc) { ctx->num=0; @@ -97,15 +97,17 @@ static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (key != NULL) idea_set_encrypt_key(key,&(ctx->c.idea_ks)); + return 1; } -static void idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +static int idea_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl) { idea_ofb64_encrypt( in,out,(long)inl, &(ctx->c.idea_ks),&(ctx->iv[0]), &ctx->num); + return 1; } #endif |