diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2021-02-25 16:49:11 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2021-03-16 19:37:06 +0900 |
commit | e35d3623de47b1a8d699f431460fbcba36de84f2 (patch) | |
tree | ea4c2e2e6a9911e52b9ba16a2efd58e5259ba7d8 /sample/openssl/smime_read.rb | |
parent | a3f97007bbd1012a4b7662b8166118b81b52527a (diff) | |
download | ruby-e35d3623de47b1a8d699f431460fbcba36de84f2.tar.gz |
[ruby/openssl] sample: avoid "include OpenSSL"
It is not a common practice and should not be done since it causes name
clash: for example, Digest and Random are provided by other standard
libraries of Ruby.
Fixes: https://github.com/ruby/openssl/issues/419
https://github.com/ruby/openssl/commit/6a6444984b
Diffstat (limited to 'sample/openssl/smime_read.rb')
-rw-r--r-- | sample/openssl/smime_read.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sample/openssl/smime_read.rb b/sample/openssl/smime_read.rb index a70105fd61..b617c6e3a5 100644 --- a/sample/openssl/smime_read.rb +++ b/sample/openssl/smime_read.rb @@ -1,6 +1,5 @@ require 'optparse' require 'openssl' -include OpenSSL options = ARGV.getopts("c:k:C:") @@ -10,14 +9,14 @@ ca_path = options["C"] data = $stdin.read -cert = X509::Certificate.new(File::read(cert_file)) -key = PKey::read(File::read(key_file)) -p7enc = PKCS7::read_smime(data) +cert = OpenSSL::X509::Certificate.new(File::read(cert_file)) +key = OpenSSL::PKey::read(File::read(key_file)) +p7enc = OpenSSL::PKCS7::read_smime(data) data = p7enc.decrypt(key, cert) -store = X509::Store.new +store = OpenSSL::X509::Store.new store.add_path(ca_path) -p7sig = PKCS7::read_smime(data) +p7sig = OpenSSL::PKCS7::read_smime(data) if p7sig.verify([], store) puts p7sig.data end |