[Composer] Upgrade defuse/php-encryption to version ^2.0

diff --git a/composer.json b/composer.json
index 77322add057741a6038360a8f7b622c6cc795ff5..e8933ffbb66f5b45df696f19b7e9770d18b161fa 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
                "ezyang/htmlpurifier": "~4.7.0",\r
                "mobiledetect/mobiledetectlib": "2.8.*",\r
                "league/html-to-markdown": "~4.4.1",\r
-               "defuse/php-encryption": "1.*",\r
+               "defuse/php-encryption": "^2.0",\r
                "pear/Text_LanguageDetect": "1.*",\r
                "pear/Text_Highlighter": "dev-master",\r
                "paragonie/random_compat": "^2.0",\r

diff --git a/composer.lock b/composer.lock
index ce9741ae136f09dbb03deb65d6ca595c6a45e4b8..46d8252bb8db1650e7eef4da033d89ca64c38f35 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "6cf3b635594e443a7268a3bd9100d62d",
+    "content-hash": "e2efb30af29afe0f5b9a001aac5da6d8",
     "packages": [
         {
             "name": "bower-asset/Chart-js",
@@ -71,28 +71,35 @@
         },
         {
             "name": "defuse/php-encryption",
-            "version": "v1.2.1",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/defuse/php-encryption.git",
-                "reference": "b87737b2eec06b13f025cabea847338fa203d1b4"
+                "reference": "5176f5abb38d3ea8a6e3ac6cd3bbb54d8185a689"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/b87737b2eec06b13f025cabea847338fa203d1b4",
-                "reference": "b87737b2eec06b13f025cabea847338fa203d1b4",
+                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/5176f5abb38d3ea8a6e3ac6cd3bbb54d8185a689",
+                "reference": "5176f5abb38d3ea8a6e3ac6cd3bbb54d8185a689",
                 "shasum": ""
             },
             "require": {
-                "ext-mcrypt": "*",
                 "ext-openssl": "*",
+                "paragonie/random_compat": "~2.0",
                 "php": ">=5.4.0"
             },
+            "require-dev": {
+                "nikic/php-parser": "^2.0|^3.0",
+                "phpunit/phpunit": "^4|^5"
+            },
+            "bin": [
+                "bin/generate-defuse-key"
+            ],
             "type": "library",
             "autoload": {
-                "files": [
-                    "Crypto.php"
-                ]
+                "psr-4": {
+                    "Defuse\\Crypto\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -101,18 +108,29 @@
             "authors": [
                 {
                     "name": "Taylor Hornby",
-                    "email": "havoc@defuse.ca"
+                    "email": "taylor@defuse.ca",
+                    "homepage": "https://defuse.ca/"
+                },
+                {
+                    "name": "Scott Arciszewski",
+                    "email": "info@paragonie.com",
+                    "homepage": "https://paragonie.com"
                 }
             ],
             "description": "Secure PHP Encryption Library",
             "keywords": [
                 "aes",
+                "authenticated encryption",
                 "cipher",
+                "crypto",
+                "cryptography",
+                "encrypt",
                 "encryption",
-                "mcrypt",
-                "security"
+                "openssl",
+                "security",
+                "symmetric key cryptography"
             ],
-            "time": "2015-03-14T20:27:45+00:00"
+            "time": "2017-05-18T21:28:48+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",