From 10289e9f229dae499d8f9c4e8252aeb728117d28 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Wed, 19 Feb 2020 05:11:54 +0000 Subject: [ruby/openssl] config: replace DupConfigPtr() with GetConfig() Now that OpenSSL::Config wraps a real CONF object, the caller can just borrow it rather than creating a new temporary CONF object. CONF object is usually treated as immutable. DupConfigPtr() is now removed, and GetConfig() is exported instead. https://github.com/ruby/openssl/commit/d9064190ca --- ext/openssl/ossl_config.c | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'ext/openssl/ossl_config.c') diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c index 52d96e1ed1..21c327b26b 100644 --- a/ext/openssl/ossl_config.c +++ b/ext/openssl/ossl_config.c @@ -25,7 +25,7 @@ static const rb_data_type_t ossl_config_type = { 0, 0, RUBY_TYPED_FREE_IMMEDIATELY, }; -static CONF * +CONF * GetConfig(VALUE obj) { CONF *conf; @@ -50,42 +50,6 @@ config_s_alloc(VALUE klass) return obj; } -/* - * DupConfigPtr is a public C-level function for getting OpenSSL CONF struct - * from an OpenSSL::Config(eConfig) instance. We decided to implement - * OpenSSL::Config in Ruby level but we need to pass native CONF struct for - * some OpenSSL features such as X509V3_EXT_*. - */ -CONF * -DupConfigPtr(VALUE obj) -{ - CONF *conf; - VALUE str; - BIO *bio; - long eline = -1; - - OSSL_Check_Kind(obj, cConfig); - str = rb_funcall(obj, rb_intern("to_s"), 0); - bio = ossl_obj2bio(&str); - conf = NCONF_new(NULL); - if(!conf){ - BIO_free(bio); - ossl_raise(eConfigError, NULL); - } - if(!NCONF_load_bio(conf, bio, &eline)){ - BIO_free(bio); - NCONF_free(conf); - if (eline <= 0) - ossl_raise(eConfigError, "wrong config format"); - else - ossl_raise(eConfigError, "error in line %d", eline); - } - BIO_free(bio); - - return conf; -} - - static void config_load_bio(CONF *conf, BIO *bio) { -- cgit v1.2.3