diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-08-23 16:50:16 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-08-23 16:50:16 -0400 |
| commit | 8f022a561a6e1cc3779edcf6089b0218c42a6d74 (patch) | |
| tree | 29de6c75102adbb7799cbf930e4ace8d053ba4e8 /config/autoconfigbackup/crypt_acb.php | |
| parent | b39ab78a8cd15d93dad3e4f8819bb475f7a56be8 (diff) | |
| download | pfsense-packages-8f022a561a6e1cc3779edcf6089b0218c42a6d74.tar.gz pfsense-packages-8f022a561a6e1cc3779edcf6089b0218c42a6d74.tar.bz2 pfsense-packages-8f022a561a6e1cc3779edcf6089b0218c42a6d74.zip | |
Unbreak ACB restore
Diffstat (limited to 'config/autoconfigbackup/crypt_acb.php')
| -rw-r--r-- | config/autoconfigbackup/crypt_acb.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/autoconfigbackup/crypt_acb.php b/config/autoconfigbackup/crypt_acb.php index 804b6a41..49a2147a 100644 --- a/config/autoconfigbackup/crypt_acb.php +++ b/config/autoconfigbackup/crypt_acb.php @@ -73,11 +73,11 @@ } function encrypt_data(& $data, $pass) { - return base64_encode(crypt_data($data, $pass, "-e")); + return trim(base64_encode(crypt_data($data, $pass, "-e"))); } function decrypt_data(& $data, $pass) { - return crypt_data(base64_decode($data), $pass, "-d"); + return trim(crypt_data(base64_decode($data), $pass, "-d")); } function tagfile_reformat($in, & $out, $tag) { @@ -93,7 +93,9 @@ $oset += $size; } - $out .= "---- END {$tag} ----\n"; + $out .= "---- END {$tag} ----"; + + $out = trim($out); return true; } @@ -119,6 +121,8 @@ $out = substr($in, $body_pos, $body_len); + $out = trim($out); + return true; } |