Skip to content
Snippets Groups Projects
Commit 4c794a56 authored by Florian Schaal's avatar Florian Schaal
Browse files

Suppress output from exec

parent 06787deb
No related branches found
No related tags found
No related merge requests found
...@@ -80,7 +80,7 @@ function get_public_key($private_key) { ...@@ -80,7 +80,7 @@ function get_public_key($private_key) {
require_once('../../lib/classes/validate_dkim.inc.php'); require_once('../../lib/classes/validate_dkim.inc.php');
$validate_dkim=new validate_dkim (); $validate_dkim=new validate_dkim ();
if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */ if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */
exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM',$pubkey,$result); exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
$public_key=pub_key($pubkey); $public_key=pub_key($pubkey);
} else { } else {
$public_key='invalid key'; $public_key='invalid key';
...@@ -92,8 +92,8 @@ $_POST=getRealPOST(); ...@@ -92,8 +92,8 @@ $_POST=getRealPOST();
switch ($_POST['action']) { switch ($_POST['action']) {
case 'create': /* create DKIM Private-key */ case 'create': /* create DKIM Private-key */
exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096', $output, $result); exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096 2> /dev/null', $output, $result);
exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024', $privkey, $result); exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024 2> /dev/null', $privkey, $result);
unlink("/usr/local/ispconfig/server/temp/random-data.bin"); unlink("/usr/local/ispconfig/server/temp/random-data.bin");
foreach($privkey as $values) $private_key=$private_key.$values."\n"; foreach($privkey as $values) $private_key=$private_key.$values."\n";
break; break;
......
...@@ -181,7 +181,7 @@ class mail_plugin_dkim { ...@@ -181,7 +181,7 @@ class mail_plugin_dkim {
$app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG); $app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
$success=true; $success=true;
/* now we get the DKIM Public-key */ /* now we get the DKIM Public-key */
exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout', $pubkey, $result); exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout 2> /dev/null', $pubkey, $result);
$public_key=''; $public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n"; foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */ /* save the DKIM Public-key in dkim-dir */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment