Remove mcrypt as a dependency

.travis.yml

@@ -2,21 +2,41 @@ sudo: false
 
 language: php
 
+sudo: required
+dist: trusty
+group: edge
+
+env:
+  global:
+    COMPOSER_DISABLE_XDEBUG_WARN=true
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 matrix:
   fast_finish: true
   include:
-    - php: 5.3
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
-      env:
-        - EXECUTE_COVERAGE=true
-    - php: 7
-    - php: hhvm
+    - php: 7.0
+    - php: 7.1
+      env: EXECUTE_COVERAGE=true
+    - php: nightly
+    - php: hhvm-3.12
+      env: COMPOSER_INSTALL_FLAGS=--ignore-platform-reqs
+    - php: hhvm-3.15
+      env: COMPOSER_INSTALL_FLAGS=--ignore-platform-reqs
+    - php: hhvm-nightly
+      env: COMPOSER_INSTALL_FLAGS=--ignore-platform-reqs
+  allow-failures:
+    - php: nightly
+    - php: hhvm-nightly
+
+install:
+  - travis_retry composer install --prefer-dist $COMPOSER_INSTALL_FLAGS
 
 script:
-  - if [[ $EXECUTE_COVERAGE == 'true' ]]; then phpunit --coverage-clover clover.xml tests; fi
-  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpunit tests; fi
+  - if [[ $EXECUTE_COVERAGE == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml; fi
+  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then vendor/bin/phpunit; fi
 
 after_success:
   - if [[ $EXECUTE_COVERAGE == 'true' ]]; then bash <(curl -s https://codecov.io/bash); fi

composer.json

@@ -14,11 +14,16 @@
       "RobRichards\\XMLSecLibs\\": "src"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "RobRichards\\XMLSecLibs\\Tests\\": "tests/src"
+    }
+  },
   "require": {
-    "php": ">= 5.3"
-   },
-  "suggest": {
-    "ext-openssl": "OpenSSL extension",
-    "ext-mcrypt": "MCrypt extension"
+    "ext-openssl": "*",
+    "php": ">= 7.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^5.7.4"
   }
 }

phpunit.xml.dist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php" colors="true">
+    <testsuites>
+        <testsuite name="old">
+            <directory suffix=".phpt">tests/</directory>
+        </testsuite>
+        <testsuite name="new">
+            <directory suffix="Test.php">tests/src/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <ini name="date.timezone" value="UTC"/>
+    </php>
+</phpunit>

src/XMLSecEnc.php

@@ -315,7 +315,7 @@ public function encryptKey($srcKey, $rawKey, $append=true)
             $this->encKey = $encKey;
         }
         $encMethod = $encKey->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
+        $encMethod->setAttribute('Algorithm', $srcKey->getAlgorithm());
         if (! empty($srcKey->name)) {
             $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
             $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));

src/XMLSecurityDSig.php

@@ -152,7 +152,7 @@ private function getXPathObj()
      */
     public static function generateGUID($prefix='pfx')
     {
-        $uuid = md5(uniqid(mt_rand(), true));
+        $uuid = bin2hex(random_bytes(16));
         $guid = $prefix.substr($uuid, 0, 8)."-".
                 substr($uuid, 8, 4)."-".
                 substr($uuid, 12, 4)."-".