diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2021-10-13 14:24:53 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-10-16 18:48:30 +0900 |
| commit | 3436bd040d8ea6abe71ac883a4254b4c651c0fd5 (patch) | |
| tree | 6ae07845dc54e87f01df5c0e98455db605ebb982 /ext/openssl | |
| parent | baa83a8a579fc85ad72e440387c795029ab33442 (diff) | |
| download | ruby-openssl-3436bd040d8ea6abe71ac883a4254b4c651c0fd5.tar.gz | |
require Ruby 2.6 or laterky/require-ruby-2.6
Drop support for Ruby 2.3, 2.4, and 2.5.
As of 2021-10, Ruby 2.6 is the oldest version that still receives
security fixes from the Ruby core team, so it doesn't make much sense
to keep code for those ancient versions.
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl.h | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey_ec.c | 3 | ||||
| -rw-r--r-- | ext/openssl/ruby_missing.h | 24 |
3 files changed, 0 insertions, 28 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 65d022c7..be9dcbdf 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -155,7 +155,6 @@ void ossl_debug(const char *, ...); * Include all parts */ #include "openssl_missing.h" -#include "ruby_missing.h" #include "ossl_asn1.h" #include "ossl_bio.h" #include "ossl_bn.h" diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index a4a61436..47de7ccd 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -598,9 +598,6 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self) ossl_raise(rb_eArgError, "wrong number of arguments"); } -#if !defined(LIKELY) && !defined(RB_LIKELY) -#define LIKELY(x) (x) -#endif ASSUME(group); RTYPEDDATA_DATA(self) = group; diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h deleted file mode 100644 index 069acc8b..00000000 --- a/ext/openssl/ruby_missing.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 'OpenSSL for Ruby' project - * Copyright (C) 2001-2003 Michal Rokos <m.rokos@sh.cvut.cz> - * All rights reserved. - */ -/* - * This program is licensed under the same licence as Ruby. - * (See the file 'LICENCE'.) - */ -#if !defined(_OSSL_RUBY_MISSING_H_) -#define _OSSL_RUBY_MISSING_H_ - -/* Ruby 2.4 */ -#ifndef RB_INTEGER_TYPE_P -# define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM)) -#endif - -/* Ruby 2.5 */ -#ifndef ST2FIX -# define RB_ST2FIX(h) LONG2FIX((long)(h)) -# define ST2FIX(h) RB_ST2FIX(h) -#endif - -#endif /* _OSSL_RUBY_MISSING_H_ */ |