From 546e34905c8cfd147eef6d5d6b3c40531d0fc584 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 9 Dec 2009 01:45:33 -0700 Subject: [PATCH] Array is a bit easier to parse in this format --- framework/Crypt/lib/Horde/Crypt/Smime.php | 33 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/framework/Crypt/lib/Horde/Crypt/Smime.php b/framework/Crypt/lib/Horde/Crypt/Smime.php index bd82f5e47..e035e0fa4 100644 --- a/framework/Crypt/lib/Horde/Crypt/Smime.php +++ b/framework/Crypt/lib/Horde/Crypt/Smime.php @@ -663,21 +663,24 @@ class Horde_Crypt_Smime extends Horde_Crypt return false; } - $cert_details = array(); - $cert_details['fingerprints']['md5'] = hash('md5', $raw_cert); - $cert_details['fingerprints']['sha1'] = hash('sha1', $raw_cert); - - $cert_details['certificate']['extensions'] = array(); - $cert_details['certificate']['version'] = $cert_data[1][0][1][0][1] + 1; - $cert_details['certificate']['serialNumber'] = $cert_data[1][0][1][1][1]; - $cert_details['certificate']['signature'] = $cert_data[1][0][1][2][1][0][1]; - $cert_details['certificate']['issuer'] = $cert_data[1][0][1][3][1]; - $cert_details['certificate']['validity'] = $cert_data[1][0][1][4][1]; - $cert_details['certificate']['subject'] = @$cert_data[1][0][1][5][1]; - $cert_details['certificate']['subjectPublicKeyInfo'] = $cert_data[1][0][1][6][1]; - - $cert_details['signatureAlgorithm'] = $cert_data[1][1][1][0][1]; - $cert_details['signature'] = $cert_data[1][2][1]; + $cert_details = array( + 'fingerprints' => array( + 'md5' => hash('md5', $raw_cert), + 'sha1' => hash('sha1', $raw_cert) + ), + 'certificate' => array( + 'extensions' => array(), + 'version' => $cert_data[1][0][1][0][1] + 1, + 'serialNumber' => $cert_data[1][0][1][1][1], + 'signature' => $cert_data[1][0][1][2][1][0][1], + 'issuer' => $cert_data[1][0][1][3][1], + 'validity' => $cert_data[1][0][1][4][1], + 'subject' => @$cert_data[1][0][1][5][1], + 'subjectPublicKeyInfo' => $cert_data[1][0][1][6][1] + ), + 'signatureAlgorithm' => $cert_data[1][1][1][0][1], + 'signature' => $cert_data[1][2][1] + ); // issuer $issuer = array(); -- 2.11.0