From 334e49365eed1443b87504aaf2cbfba2ea43a8a0 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 25 Feb 2016 21:40:35 +0100 Subject: [PATCH] (legacy) spaces in crypt.inc --- src/etc/inc/crypt.inc | 94 +++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc index 39d8793de..63eb80269 100644 --- a/src/etc/inc/crypt.inc +++ b/src/etc/inc/crypt.inc @@ -28,81 +28,81 @@ function _crypt_data($val, $pass, $opt) { - $result = ''; + $result = ''; - $file = tempnam('/tmp', 'php-encrypt'); - file_put_contents("{$file}.dec", $val); + $file = tempnam('/tmp', 'php-encrypt'); + file_put_contents("{$file}.dec", $val); - exec(sprintf( - '/usr/local/bin/openssl enc %s -aes-256-cbc -in %s.dec -out %s.enc -k %s', - escapeshellarg($opt), - escapeshellarg($file), - escapeshellarg($file), - escapeshellarg($pass) - )); + exec(sprintf( + '/usr/local/bin/openssl enc %s -aes-256-cbc -in %s.dec -out %s.enc -k %s', + escapeshellarg($opt), + escapeshellarg($file), + escapeshellarg($file), + escapeshellarg($pass) + )); - if (file_exists("{$file}.enc")) { - $result = file_get_contents("{$file}.enc"); - } else { - log_error(gettext('Failed to encrypt/decrypt data!')); - } + if (file_exists("{$file}.enc")) { + $result = file_get_contents("{$file}.enc"); + } else { + log_error(gettext('Failed to encrypt/decrypt data!')); + } - @unlink($file); - @unlink("{$file}.dec"); - @unlink("{$file}.enc"); + @unlink($file); + @unlink("{$file}.dec"); + @unlink("{$file}.enc"); - return $result; + return $result; } function encrypt_data(&$data, $pass) { - return base64_encode(_crypt_data($data, $pass, '-e')); + return base64_encode(_crypt_data($data, $pass, '-e')); } function decrypt_data(&$data, $pass) { - return _crypt_data(base64_decode($data), $pass, '-d'); + return _crypt_data(base64_decode($data), $pass, '-d'); } function tagfile_reformat($in, &$out, $tag) { - $out = "---- BEGIN {$tag} ----\n"; + $out = "---- BEGIN {$tag} ----\n"; - $size = 80; - $oset = 0; - while ($size >= 64) { - $line = substr($in, $oset, 64); - $out .= $line . "\n"; - $size = strlen($line); - $oset += $size; - } + $size = 80; + $oset = 0; + while ($size >= 64) { + $line = substr($in, $oset, 64); + $out .= $line . "\n"; + $size = strlen($line); + $oset += $size; + } - $out .= "---- END {$tag} ----\n"; + $out .= "---- END {$tag} ----\n"; - return true; + return true; } function tagfile_deformat($in, &$out, $tag) { - $btag_val = "---- BEGIN {$tag} ----"; - $etag_val = "---- END {$tag} ----"; + $btag_val = "---- BEGIN {$tag} ----"; + $etag_val = "---- END {$tag} ----"; - $btag_len = strlen($btag_val); - $etag_len = strlen($etag_val); + $btag_len = strlen($btag_val); + $etag_len = strlen($etag_val); - $btag_pos = stripos($in, $btag_val); - $etag_pos = stripos($in, $etag_val); + $btag_pos = stripos($in, $btag_val); + $etag_pos = stripos($in, $etag_val); - if (($btag_pos === false) || ($etag_pos === false)) { - return false; - } + if (($btag_pos === false) || ($etag_pos === false)) { + return false; + } - $body_pos = $btag_pos + $btag_len; - $body_len = strlen($in); - $body_len -= $btag_len; - $body_len -= $etag_len + 1; + $body_pos = $btag_pos + $btag_len; + $body_len = strlen($in); + $body_len -= $btag_len; + $body_len -= $etag_len + 1; - $out = substr($in, $body_pos, $body_len); + $out = substr($in, $body_pos, $body_len); - return true; + return true; }