diff options
| author | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-03-11 21:35:28 +0000 |
|---|---|---|
| committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-03-11 21:35:28 +0000 |
| commit | fcb0234e46e8fc656748f364148754a1cc80ea4b (patch) | |
| tree | 75c6dc33e04a77a7b503fd767db1dc365338eb79 /ossl_cipher.c | |
| parent | 7ed17afc8c327bc88d1510255d284487d06f226c (diff) | |
| download | ruby-openssl-history-fcb0234e46e8fc656748f364148754a1cc80ea4b.tar.gz | |
* Cipher IV fixup
Diffstat (limited to 'ossl_cipher.c')
| -rw-r--r-- | ossl_cipher.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ossl_cipher.c b/ossl_cipher.c index e3bb9ff..48053fc 100644 --- a/ossl_cipher.c +++ b/ossl_cipher.c @@ -124,7 +124,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) * TODO: * random IV generation! */ - memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv)); + memcpy(iv, "OpenSSL for Ruby rulez!", EVP_MAX_IV_LENGTH); /* RAND_add(data,i,0); where from take data? if (RAND_pseudo_bytes(iv, 8) < 0) { @@ -133,7 +133,11 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) */ } else { init_v = rb_obj_as_string(init_v); - memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv)); + if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) { + memset(iv, 0, EVP_MAX_IV_LENGTH); + memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len); + } else + memcpy(iv, RSTRING(init_v)->ptr, EVP_MAX_IV_LENGTH); } EVP_CIPHER_CTX_init(ciphp->ctx); @@ -165,10 +169,14 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self) * TODO: * random IV generation! */ - memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv)); + memcpy(iv, "OpenSSL for Ruby rulez!", EVP_MAX_IV_LENGTH); } else { init_v = rb_obj_as_string(init_v); - memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv)); + if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) { + memset(iv, 0, EVP_MAX_IV_LENGTH); + memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len); + } else + memcpy(iv, RSTRING(init_v)->ptr, EVP_MAX_IV_LENGTH); } EVP_CIPHER_CTX_init(ciphp->ctx); |