Add support for X509 and RSA public in encrypt

voxpupuli · May 2, 2024 · 224d91e · 224d91e
1 parent 57cdc1b
commit 224d91e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/hiera/backend/eyaml/encryptors/pkcs7.rb b/lib/hiera/backend/eyaml/encryptors/pkcs7.rb
@@ -31,9 +31,13 @@ def self.encrypt(plaintext)
             LoggingHelper.trace 'PKCS7 encrypt'
 
             public_key_pem = self.load_public_key_pem()
-            public_key_rsa = OpenSSL::PKey::RSA.new(public_key_pem)
-            public_key_x509 = OpenSSL::X509::Certificate.new
-            public_key_x509.public_key = public_key_rsa.public_key
+            if /BEGIN CERTIFICATE/.match(public_key_pem) != nil
+              public_key_x509 = OpenSSL::X509::Certificate.new(public_key_pem)
+            elsif /BEGIN PUBLIC KEY/.match(public_key_pem) != nil
+              public_key_rsa = OpenSSL::PKey::RSA.new(public_key_pem)
+              public_key_x509 = OpenSSL::X509::Certificate.new
+              public_key_x509.public_key = public_key_rsa.public_key
+            end
 
             cipher = OpenSSL::Cipher.new('aes-256-cbc')
             OpenSSL::PKCS7.encrypt([public_key_x509], plaintext, cipher, OpenSSL::PKCS7::BINARY).to_der