Commit 334e4936 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) spaces in crypt.inc

parent 234f54d8
...@@ -28,81 +28,81 @@ ...@@ -28,81 +28,81 @@
function _crypt_data($val, $pass, $opt) function _crypt_data($val, $pass, $opt)
{ {
$result = ''; $result = '';
$file = tempnam('/tmp', 'php-encrypt'); $file = tempnam('/tmp', 'php-encrypt');
file_put_contents("{$file}.dec", $val); file_put_contents("{$file}.dec", $val);
exec(sprintf( exec(sprintf(
'/usr/local/bin/openssl enc %s -aes-256-cbc -in %s.dec -out %s.enc -k %s', '/usr/local/bin/openssl enc %s -aes-256-cbc -in %s.dec -out %s.enc -k %s',
escapeshellarg($opt), escapeshellarg($opt),
escapeshellarg($file), escapeshellarg($file),
escapeshellarg($file), escapeshellarg($file),
escapeshellarg($pass) escapeshellarg($pass)
)); ));
if (file_exists("{$file}.enc")) { if (file_exists("{$file}.enc")) {
$result = file_get_contents("{$file}.enc"); $result = file_get_contents("{$file}.enc");
} else { } else {
log_error(gettext('Failed to encrypt/decrypt data!')); log_error(gettext('Failed to encrypt/decrypt data!'));
} }
@unlink($file); @unlink($file);
@unlink("{$file}.dec"); @unlink("{$file}.dec");
@unlink("{$file}.enc"); @unlink("{$file}.enc");
return $result; return $result;
} }
function encrypt_data(&$data, $pass) 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) 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) function tagfile_reformat($in, &$out, $tag)
{ {
$out = "---- BEGIN {$tag} ----\n"; $out = "---- BEGIN {$tag} ----\n";
$size = 80; $size = 80;
$oset = 0; $oset = 0;
while ($size >= 64) { while ($size >= 64) {
$line = substr($in, $oset, 64); $line = substr($in, $oset, 64);
$out .= $line . "\n"; $out .= $line . "\n";
$size = strlen($line); $size = strlen($line);
$oset += $size; $oset += $size;
} }
$out .= "---- END {$tag} ----\n"; $out .= "---- END {$tag} ----\n";
return true; return true;
} }
function tagfile_deformat($in, &$out, $tag) function tagfile_deformat($in, &$out, $tag)
{ {
$btag_val = "---- BEGIN {$tag} ----"; $btag_val = "---- BEGIN {$tag} ----";
$etag_val = "---- END {$tag} ----"; $etag_val = "---- END {$tag} ----";
$btag_len = strlen($btag_val); $btag_len = strlen($btag_val);
$etag_len = strlen($etag_val); $etag_len = strlen($etag_val);
$btag_pos = stripos($in, $btag_val); $btag_pos = stripos($in, $btag_val);
$etag_pos = stripos($in, $etag_val); $etag_pos = stripos($in, $etag_val);
if (($btag_pos === false) || ($etag_pos === false)) { if (($btag_pos === false) || ($etag_pos === false)) {
return false; return false;
} }
$body_pos = $btag_pos + $btag_len; $body_pos = $btag_pos + $btag_len;
$body_len = strlen($in); $body_len = strlen($in);
$body_len -= $btag_len; $body_len -= $btag_len;
$body_len -= $etag_len + 1; $body_len -= $etag_len + 1;
$out = substr($in, $body_pos, $body_len); $out = substr($in, $body_pos, $body_len);
return true; return true;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment