diff options
Diffstat (limited to 'CommModule')
| -rw-r--r-- | CommModule/.gitignore | 19 | ||||
| -rwxr-xr-x | CommModule/client.pl | 10 | ||||
| -rwxr-xr-x | CommModule/serial.conf | 32 |
3 files changed, 24 insertions, 37 deletions
diff --git a/CommModule/.gitignore b/CommModule/.gitignore new file mode 100644 index 0000000..40a9309 --- /dev/null +++ b/CommModule/.gitignore @@ -0,0 +1,19 @@ +# Ignore autogenerated serial conf file +/serial.conf +/serialserver.conf + +# Ignore *-active files +/client.pl-active +/server.pl-active + +# Ignore log files +/logfile20??-??-??.txt +/nohup.out +/oldlogs/ + +# Ignore working files generated by the signer +/currentcrls/ +/delta?.diff +/revoke-root?.crl +/timesync.sh +/work/ diff --git a/CommModule/client.pl b/CommModule/client.pl index bf92b27..002b661 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -40,8 +40,8 @@ my $paranoid=1; my $debug=0; -#my $serialport="/dev/ttyS0"; -my $serialport="/dev/ttyUSB0"; +my $serialport="/dev/ttyS1"; +#my $serialport="/dev/ttyUSB0"; my $gpgbin="/usr/bin/gpg"; @@ -444,9 +444,9 @@ sub calculateDays($) my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' group by `to`"); SysLog("Summe: $sum[0]\n") if($debug); - return ($sum[0]>=50)?730:180; + return ($sum[0]>=50)?30:3; } - return 180; + return 3; } sub X509extractSAN($) @@ -832,7 +832,7 @@ sub HandleCerts($$) SysLog "SAN: --$SAN--\n" if($debug); SysLog "memid: $row{'memid'}\n" if($debug); - my $days=$org?($server?(365*2):365):calculateDays($row{"memid"}); + my $days=$org?($server?(30):7):calculateDays($row{"memid"}); $crt=Request($ver,1,1,$row{'rootcert'}-1,$profile,$row{'md'}eq"sha1"?2:0,$days,$row{'keytype'}eq"NS"?1:0,$content,$SAN,$subject); diff --git a/CommModule/serial.conf b/CommModule/serial.conf deleted file mode 100755 index bd9980c..0000000 --- a/CommModule/serial.conf +++ /dev/null @@ -1,32 +0,0 @@ -Device::SerialPort_Configuration_File -- DO NOT EDIT -- -/dev/ttyUSB0 - -C_CFLAG,7346 -C_IFLAG,0 -C_ISPEED,4098 -C_LFLAG,2608 -C_OFLAG,4 -C_OSPEED,4098 -C_VERASE,127 -C_VQUIT,28 -C_VSUSP,26 -C_VINTR,3 -C_VSTOP,19 -C_VSTART,17 -C_VKILL,21 -C_VMIN,0 -C_VEOF,4 -C_VEOL,0 -C_VTIME,0 -CFG_1,none -RCONST,0 -CFG_2,none -HNAME,localhost -ALIAS,/dev/ttyUSB0 -CFG_3,none -U_MSG,0 -DATYPE,raw -E_MSG,0 -HADDR,0 -RTOT,0 -DVTYPE,none |