From 748d1d453480df3108d1465b8c4b8893ca97c52b Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Tue, 19 Jan 2016 16:55:12 +0100
Subject: Add compatibility layer for digging around in non-public data
 structures.

---
 src/x509.erl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/x509.erl')

diff --git a/src/x509.erl b/src/x509.erl
index 279d9b9..2d4cffa 100644
--- a/src/x509.erl
+++ b/src/x509.erl
@@ -171,10 +171,7 @@ signed_by_p(SubjectDer, IssuerDer) ->
     end.
 
 verify_sig(IssuerSPKI, {DigestOrPlainText, DigestType, Signature}) ->
-    %% Dig out alg, params and key from issuer.
-    #'SubjectPublicKeyInfo'{
-       algorithm = #'AlgorithmIdentifier'{algorithm = Alg, parameters = Params},
-       subjectPublicKey = {0, Key0}} = IssuerSPKI,
+    {Alg, Params, Key0} = compat:unpack_issuer(IssuerSPKI),
     KeyType = pubkey_cert_records:supportedPublicKeyAlgorithms(Alg),
     IssuerKey =
         case KeyType of
@@ -196,7 +193,7 @@ verify_sig(IssuerSPKI, {DigestOrPlainText, DigestType, Signature}) ->
 %% Code from pubkey_cert:extract_verify_data/2.
 extract_verify_data(Cert, DerCert) ->
     PlainText = encoded_tbs_cert(DerCert),
-    {_, Sig} = Cert#'Certificate'.signature,
+    Sig = compat:unpack_signature(Cert#'Certificate'.signature),
     SigAlgRecord = Cert#'Certificate'.signatureAlgorithm,
     SigAlg = SigAlgRecord#'AlgorithmIdentifier'.algorithm,
     try
-- 
cgit v1.1