Merge branch '1.0' into 2.0

CHANGELOG.md

@@ -50,6 +50,10 @@
 - Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243))
 - The use of an autoloader is now required (e.g. Composer)
 
+## 1.0.5 - 2016-10-22
+
+- fix issue preventing installation of 1.0.x via Composer (#1048)
+
 ## 1.0.4 - 2016-10-03
 
 - fix E_DEPRECATED errors on PHP 7.0 and 7.1 (#1041)

README.md

@@ -6,7 +6,7 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer
 arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
 AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
-* [Download (1.0.4)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.4.zip/download)
+* [Download (1.0.5)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.5.zip/download)
 * [Browse Git](https://github.com/phpseclib/phpseclib)
 * [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/2.0/latest/)
 

composer.json

@@ -66,11 +66,16 @@
         "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
     },
     "autoload": {
+        "psr-0": {
+            "Crypt": "phpseclib/",
+            "File": "phpseclib/",
+            "Math": "phpseclib/",
+            "Net": "phpseclib/",
+            "System": "phpseclib/"
+        },
         "files": [
-            "phpseclib/bootstrap.php"
-        ],
-        "psr-4": {
-            "phpseclib\\": "phpseclib/"
-        }
+            "phpseclib/bootstrap.php",
+            "phpseclib/Crypt/Random.php"
+        ]
     }
 }