From ad0add9f08ad687cb1f25f3de65c398b19da7f21 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Thu, 1 Jul 2004 04:51:19 +0000 Subject: [PATCH] * ext/openssl/ossl_cipher.c (ossl_cipher_set_padding): last modify is rolled back for future compatibility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 3 --- ext/openssl/ossl_cipher.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f966e6e54..66175b83ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,9 +25,6 @@ Thu Jul 1 11:59:45 2004 GOTOU Yuuzou * ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method OpenSSL::Cipher::Cipher#key_len=. - * ext/openssl/ossl_cipher.c (ossl_cipher_set_padding): the type of - argument is changed from integer to boolean. - * ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new finction; print warning for Cipher#<<. diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 6e238189d1..98468e0f28 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -326,9 +326,7 @@ ossl_cipher_set_padding(VALUE self, VALUE padding) EVP_CIPHER_CTX *ctx; GetCipher(self, ctx); - if(rb_obj_is_kind_of(padding, rb_cInteger)) - padding = NUM2INT(padding) ? Qtrue : Qfalse; - if (EVP_CIPHER_CTX_set_padding(ctx, RTEST(padding)) != 1) + if (EVP_CIPHER_CTX_set_padding(ctx, NUM2INT(padding)) != 1) ossl_raise(eCipherError, NULL); #else rb_notimplement();