Adhere strict types

sop · Nov 28, 2017 · 8f52d72 · 8f52d72
1 parent 7ca91ec
commit 8f52d72
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/PKCS8/EncryptedPrivateKeyInfo.php b/lib/PKCS8/EncryptedPrivateKeyInfo.php
@@ -4,6 +4,7 @@
 
 namespace Sop\PKCS8;
 
+use ASN1\Type\UnspecifiedType;
 use ASN1\Type\Constructed\Sequence;
 use ASN1\Type\Primitive\OctetString;
 use Sop\CryptoBridge\Crypto;
@@ -75,7 +76,7 @@ public static function fromASN1(Sequence $seq): self
      */
     public static function fromDER(string $data): self
     {
-        return self::fromASN1(Sequence::fromDER($data));
+        return self::fromASN1(UnspecifiedType::fromDER($data)->asSequence());
     }
 
     /**
@@ -163,7 +164,8 @@ public function decryptWithPassword(string $password, Crypto $crypto = null): Pr
         try {
             $scheme = PBEScheme::fromAlgorithmIdentifier($ai, $crypto);
             $data = $scheme->decrypt($this->_data, $password);
-            return PrivateKeyInfo::fromASN1(Sequence::fromDER($data));
+            return PrivateKeyInfo::fromASN1(
+                UnspecifiedType::fromDER($data)->asSequence());
         } catch (\RuntimeException $e) {
             throw new \RuntimeException("Failed to decrypt private key.", 0, $e);
         }