summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2024-03-10 19:12:31 +0900
committernagachika <nagachika@ruby-lang.org>2024-03-10 19:12:31 +0900
commitb12343c3b6c557b7e5668dcd8a9eab12fc9ee2c0 (patch)
tree70bda041ef2a1a7e236bc5dd93bf1186b83ed15c
parent80112a9847b705b53e17e48540a6d00daa7e59a4 (diff)
merge revision(s) d2cd903c85f38f42c6aefc6d97a1558f74d8d9db:ruby_3_2
[ruby/openssl] pkey/ec: constify https://github.com/ruby/openssl/commit/6fb3499a7b --- ext/openssl/ossl_pkey_ec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r--ext/openssl/ossl_pkey_ec.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index a59849f719..92842f95ac 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -483,7 +483,7 @@ static VALUE ossl_ec_key_check_key(VALUE self)
#ifdef HAVE_EVP_PKEY_CHECK
EVP_PKEY *pkey;
EVP_PKEY_CTX *pctx;
- EC_KEY *ec;
+ const EC_KEY *ec;
GetPKey(self, pkey);
GetEC(self, ec);
diff --git a/version.h b/version.h
index a84b0012c8..d45baa6fd1 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 159
+#define RUBY_PATCHLEVEL 160
#include "ruby/version.h"
#include "ruby/internal/abi.h"