Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.

1 files changed, 3 insertions, 7 deletions

diff --git a/boot.php b/boot.php
index ed96ca4c1..c84604dc1 100755
--- a/boot.php
+++ b/boot.php
@@ -803,12 +803,6 @@ class App {
 
 		$scheme = $this->scheme;
 
-//		if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-//			if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) {
-//				$scheme = 'https';
-//			}
-//		}
-			
 		$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
 		return $this->baseurl;
 	}
@@ -995,6 +989,9 @@ class App {
 		)) . $this->page['htmlhead'];
 	}
 
+	// The following curl functions will go away once we've converted
+	// all instances of (fetch|post)_url() to z_(fetch|post)_url()
+
 	function set_curl_code($code) {
 		$this->curl_code = $code;
 	}
@@ -1186,7 +1183,6 @@ function is_ajax() {
 // $_SERVER variables, and synchronising the state of installed plugins.
 
 
-
 function check_config(&$a) {
 
 	$build = get_config('system','db_version');