From 1ce6af4aad0107b6d604f89a3c0b530476a10165 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Jan 2020 00:08:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/email/smime/certificate.rb | 6 ++---- lib/gitlab/email/smime/signer.rb | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'lib/gitlab/email/smime') diff --git a/lib/gitlab/email/smime/certificate.rb b/lib/gitlab/email/smime/certificate.rb index b331c4ca19c..59d7b0c3c5b 100644 --- a/lib/gitlab/email/smime/certificate.rb +++ b/lib/gitlab/email/smime/certificate.rb @@ -4,8 +4,6 @@ module Gitlab module Email module Smime class Certificate - include OpenSSL - attr_reader :key, :cert def key_string @@ -17,8 +15,8 @@ module Gitlab end def self.from_strings(key_string, cert_string) - key = PKey::RSA.new(key_string) - cert = X509::Certificate.new(cert_string) + key = OpenSSL::PKey::RSA.new(key_string) + cert = OpenSSL::X509::Certificate.new(cert_string) new(key, cert) end diff --git a/lib/gitlab/email/smime/signer.rb b/lib/gitlab/email/smime/signer.rb index 2fa83014003..db03e383ecf 100644 --- a/lib/gitlab/email/smime/signer.rb +++ b/lib/gitlab/email/smime/signer.rb @@ -7,20 +7,18 @@ module Gitlab module Smime # Tooling for signing and verifying data with SMIME class Signer - include OpenSSL - def self.sign(cert:, key:, data:) - signed_data = PKCS7.sign(cert, key, data, nil, PKCS7::DETACHED) - PKCS7.write_smime(signed_data) + signed_data = OpenSSL::PKCS7.sign(cert, key, data, nil, OpenSSL::PKCS7::DETACHED) + OpenSSL::PKCS7.write_smime(signed_data) end # return nil if data cannot be verified, otherwise the signed content data def self.verify_signature(cert:, ca_cert: nil, signed_data:) - store = X509::Store.new + store = OpenSSL::X509::Store.new store.set_default_paths store.add_cert(ca_cert) if ca_cert - signed_smime = PKCS7.read_smime(signed_data) + signed_smime = OpenSSL::PKCS7.read_smime(signed_data) signed_smime if signed_smime.verify([cert], store) end end -- cgit v1.2.3