diff options
| author | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-04-07 16:34:43 +0000 |
|---|---|---|
| committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-04-07 16:34:43 +0000 |
| commit | bc603852659675cd0c7420dd4d126780f7ba6ee2 (patch) | |
| tree | b3d68ace93981e8f961f8b2a3451df3d53eac993 /ossl_cipher.c | |
| parent | fcb0234e46e8fc656748f364148754a1cc80ea4b (diff) | |
| download | ruby-openssl-history-bc603852659675cd0c7420dd4d126780f7ba6ee2.tar.gz | |
* Macros fixupsossl1-ossl2-branch-point
* X509ExtFactory cleanup
* fixed strptime warning on Linux
* X509::Certificate#version has been changed!
!!! WARNING !!!
x509.version = 2 -> defines X509v3, (0 for v1, 1 for v2, ...)
p x509.version -> 2, means that it is X509v3
!!! WARNING !!!
Diffstat (limited to 'ossl_cipher.c')
| -rw-r--r-- | ossl_cipher.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ossl_cipher.c b/ossl_cipher.c index 48053fc..f908257 100644 --- a/ossl_cipher.c +++ b/ossl_cipher.c @@ -10,9 +10,7 @@ */ #include "ossl.h" -#define MakeCipher(obj, klass, ciphp) {\ - obj = Data_Make_Struct(klass, ossl_cipher, 0, ossl_cipher_free, ciphp);\ -} +#define MakeCipher(obj, klass, ciphp) obj = Data_Make_Struct(klass, ossl_cipher, 0, ossl_cipher_free, ciphp) #define GetCipher(obj, ciphp) Data_Get_Struct(obj, ossl_cipher, ciphp) /* @@ -66,6 +64,7 @@ ossl_cipher_get_NID(VALUE obj) ossl_cipher *ciphp = NULL; OSSL_Check_Type(obj, cCipher); + GetCipher(obj, ciphp); return ciphp->nid; /*EVP_CIPHER_CTX_nid(ciphp->ctx);*/ @@ -124,7 +123,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) * TODO: * random IV generation! */ - memcpy(iv, "OpenSSL for Ruby rulez!", EVP_MAX_IV_LENGTH); + memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv)); /* RAND_add(data,i,0); where from take data? if (RAND_pseudo_bytes(iv, 8) < 0) { @@ -137,7 +136,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self) 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); + memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv)); } EVP_CIPHER_CTX_init(ciphp->ctx); |