Merge branch 'master' into v4_phpseclibs

Author: robrichards

src/XMLSecurityKey.php

@@ -66,6 +66,7 @@ class XMLSecurityKey
     const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
     const RSA_SHA384 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384';
     const RSA_SHA512 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha512';
+    const ECDSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256';
     const HMAC_SHA1 = 'http://www.w3.org/2000/09/xmldsig#hmac-sha1';
     const RSA_SHA256_MGF1 = 'http://www.w3.org/2007/05/xmldsig-more#sha256-rsa-MGF1';
     const AUTHTAG_LENGTH = 16;
@@ -250,6 +251,17 @@ public function __construct($type, $params=null)
                     }
                 }
                 throw new Exception('Certificate "type" (private/public) must be passed via parameters');
+            case (self::ECDSA_SHA256):
+                $this->cryptParams['library'] = 'phpseclib';
+                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256';
+                $this->cryptParams['digest'] = 'SHA256';
+                if (is_array($params) && ! empty($params['type'])) {
+                    if ($params['type'] == 'public' || $params['type'] == 'private') {
+                        $this->cryptParams['type'] = $params['type'];
+                        break;
+                    }
+                }
+                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
             case (self::RSA_SHA384):
                 $this->cryptParams['library'] = 'phpseclib';
                 $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384';
@@ -618,6 +630,12 @@ public function signData($data)
             case 'phpseclib':
                 $passphrase = $this->passphrase !== '' ? $this->passphrase : false;
                 $private = PublicKeyLoader::load($this->key, $passphrase);
+                if ($this->type === self::ECDSA_SHA256) {
+                    return $private
+                        ->withHash($this->cryptParams['digest'])
+                        ->withSignatureFormat('IEEE')
+                        ->sign($data);
+                }
                 return $this->configureRSAKey($private)->sign($data);
             case (self::HMAC_SHA1):
                 return hash_hmac("sha1", $data, $this->key, true);
@@ -646,6 +664,13 @@ public function verifySignature($data, $signature)
             case 'phpseclib':
                 try {
                     $public = PublicKeyLoader::load($this->key);
+                    if ($this->type === self::ECDSA_SHA256) {
+                        $result = $public
+                            ->withHash($this->cryptParams['digest'])
+                            ->withSignatureFormat('IEEE')
+                            ->verify($data, $signature);
+                        return $result === true ? 1 : 0;
+                    }
                     $result = $this->configureRSAKey($public)->verify($data, $signature);
                     return $result === true ? 1 : 0;
                 } catch (Exception $e) {