Simplify handling of version constant.

ruby · Oct 31, 2019 · 93804ee · 93804ee
1 parent 45fdf02
commit 93804ee
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
@@ -1156,11 +1156,6 @@ Init_openssl(void)
     rb_global_variable(&mOSSL);
     rb_define_singleton_method(mOSSL, "fixed_length_secure_compare", ossl_crypto_fixed_length_secure_compare, 2);
 
-    /*
-     * OpenSSL ruby extension version
-     */
-    rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
-
     /*
      * Version of OpenSSL the ruby OpenSSL extension was built with
      */

diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
@@ -174,7 +174,6 @@ void ossl_debug(const char *, ...);
 #ifndef OPENSSL_NO_TS
   #include "ossl_ts.h"
 #endif
-#include "ossl_version.h"
 #include "ossl_x509.h"
 #include "ossl_engine.h"
 #include "ossl_kdf.h"

diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
diff --git a/lib/openssl/version.rb b/lib/openssl/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module OpenSSL
+  VERSION = "2.2.0" unless defined?(VERSION)
+end
diff --git a/openssl.gemspec b/openssl.gemspec
@@ -1,6 +1,9 @@
+
+require_relative 'lib/openssl/version'
+
 Gem::Specification.new do |spec|
   spec.name          = "openssl"
-  spec.version       = "2.1.2"
+  spec.version       = OpenSSL::VERSION
   spec.authors       = ["Martin Bosslet", "SHIBATA Hiroshi", "Zachary Scott", "Kazuki Yamaguchi"]
   spec.email         = ["[email protected]"]
   spec.summary       = %q{OpenSSL provides SSL, TLS and general purpose cryptography.}