From d760d97fc87907b5a7d989e16bf1fe01481a5fbb Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Tue, 4 Oct 2016 08:26:52 -0500
Subject: [PATCH 1/2] CHANGELOG: add 1.0.4 release

---
 CHANGELOG.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1354ab91..81c18d88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.0.4 - 2016-10-03
+
+- fix E_DEPRECATED errors on PHP 7.0 and 7.1 (#1041)
+- fix float to int conversions on 32-bit Linux pre-PHP 5.3 (#1038, #1034)
+- SFTP: speed up downloads (#945)
+- SFTP: fix infinite loop when uploading empty file (#995)
+- ASN1: fix possible infinite loop in decode (#1027)
+
 ## 1.0.3 - 2016-08-18
 
 - BigInteger/RSA: don't compare openssl versions > 1.0 (#946)
@@ -139,4 +147,4 @@
 = add support for AES-128-CBC and DES-EDE3-CFB encrypted RSA private keys
 - add Net_SFTP::stat(), Net_SFTP::lstat() and Net_SFTP::rawlist()
 - logging was added to Net_SSH1
-- the license was changed to the less restrictive MIT license
\ No newline at end of file
+- the license was changed to the less restrictive MIT license

From f5d8377cdbddbdd4107a789d2a700f42a95c2009 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 20 Oct 2016 21:29:55 +0200
Subject: [PATCH 2/2] Backport tests/bootstrap.php from 2.0 / master onto 1.0.

---
 tests/bootstrap.php | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 561b0a82..bb137e4d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -7,25 +7,13 @@
 
 date_default_timezone_set('UTC');
 
-// Set up include path accordingly. This is especially required because some
-// class files of phpseclib require() other dependencies.
-set_include_path(implode(PATH_SEPARATOR, array(
-    dirname(__FILE__) . '/../phpseclib/',
-    dirname(__FILE__) . '/',
-    get_include_path(),
-)));
-
-require_once 'Crypt/Random.php';
-
-function phpseclib_autoload($class)
-{
-    $file = str_replace('_', '/', $class) . '.php';
-
-    if (phpseclib_resolve_include_path($file)) {
-        // @codingStandardsIgnoreStart
-        require $file;
-        // @codingStandardsIgnoreEnd
-    }
+$loader_path = __DIR__ . '/../vendor/autoload.php';
+if (!file_exists($loader_path)) {
+    echo "Dependencies must be installed using composer:\n\n";
+    echo "php composer.phar install\n\n";
+    echo "See http://getcomposer.org for help with installing composer\n";
+    exit(1);
 }
 
-spl_autoload_register('phpseclib_autoload');
+$loader = include $loader_path;
+$loader->add('', __DIR__);