diff options
| author | root <root@test.cacert.org> | 2019-07-26 20:39:14 +0000 |
|---|---|---|
| committer | root <root@test.cacert.org> | 2019-07-26 20:39:14 +0000 |
| commit | f148ad50c33a2b21a6ac85bb2fe4f844cf0e9915 (patch) | |
| tree | 70d31d1df70a5b09b1b4b8e06e7d66aa6274ade5 | |
| parent | bd1afd659c60e45a21c2ba810baae54c4d884d10 (diff) | |
| download | cacert-devel-integration.tar.gz cacert-devel-integration.tar.xz cacert-devel-integration.zip | |
Working combination of client.pl and serial.conf. Hopefully.integration
| -rwxr-xr-x | CommModule/client.pl | 5 | ||||
| -rw-r--r-- | CommModule/serial.conf | 28 |
2 files changed, 16 insertions, 17 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl index 5155c05..b18055f 100755 --- a/CommModule/client.pl +++ b/CommModule/client.pl @@ -40,7 +40,6 @@ my $paranoid=1; my $debug=0; -#my $serialport="/dev/ttyS0"; my $serialport="/dev/ttyS1"; #my $serialport="/dev/ttyUSB0"; @@ -897,8 +896,8 @@ sub HandleCerts($$) $body .= "https://www.cacert.org/account.php?id=".($server?"15":"6")."&cert=$row{id}\n\n"; $body .= _("If you have not imported CAcert's root certificate, please go to:")."\n"; $body .= "https://www.cacert.org/index.php?id=3\n"; - $body .= "Root cert fingerprint = A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B\n"; - $body .= "Root cert fingerprint = 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33\n\n"; + $body .= "Root cert SHA256 fingerprint: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5\n"; + $body .= "Root cert SHA1 fingerprint: DDFC DA54 1E75 77AD DCA8 7E88 27A9 8A50 6032 52A5\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n"; sendmail($user{email}, "[CAcert.org] "._("Your certificate"), $body, "support\@cacert.org", "", "", "CAcert Support"); } diff --git a/CommModule/serial.conf b/CommModule/serial.conf index 12dd87b..649370d 100644 --- a/CommModule/serial.conf +++ b/CommModule/serial.conf @@ -1,32 +1,32 @@ Device::SerialPort_Configuration_File -- DO NOT EDIT -- /dev/ttyS1 -C_CFLAG,6322 +C_CFLAG,2239 C_IFLAG,1 C_ISPEED,4098 C_LFLAG,2608 C_OFLAG,4 C_OSPEED,4098 -C_VSTART,17 +C_VSUSP,26 C_VTIME,0 -C_VEOL,0 -C_VKILL,21 +C_VERASE,127 C_VQUIT,28 -C_VSUSP,26 -C_VSTOP,19 +C_VEOL,0 C_VINTR,3 +C_VSTART,17 +C_VMIN,1 C_VEOF,4 -C_VERASE,127 -C_VMIN,0 -CFG_2,none -CFG_1,none -E_MSG,0 -RCONST,0 +C_VSTOP,19 +C_VKILL,21 U_MSG,0 ALIAS,/dev/ttyS1 +DVTYPE,none HNAME,localhost -DATYPE,raw RTOT,0 -DVTYPE,none +DATYPE,raw +E_MSG,0 +RCONST,0 +CFG_2,none HADDR,0 +CFG_1,none CFG_3,none |