Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

included SHA256 and SHA1 fingerprints & adjust space #19

Merged
merged 1 commit into from Dec 12, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

included SHA256 and SHA1 fingerprints & adjust space

  • Loading branch information...
GuKKDevel committed Dec 10, 2018
commit ca4e5f03eef4a8a174437fb065a967ce92dab847
@@ -53,11 +53,13 @@ function Header()
$this->SetFont('Arial','',6);
if($_SESSION['_config']['language'] == "ja")
$this->SetFont('SJIS','',6);
$this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints (since 2019)")),0,0,'C');
$this->Cell(0,0, recode($_SESSION['_config']['recode'], _("CAcert's Root Certificate fingerprints"). _(" (since 2019)")),0,0,'C');
$this->ln(3);
$this->Cell(0,0, recode($_SESSION['_config']['recode'], "root: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5 "._("and")." class3: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544"),0,0,'C');
$this->SetLineWidth(0.05);
$this->Line(1, 43, $this->w - 1, 43);
$this->Cell(0,0, recode($_SESSION['_config']['recode'], "SHA1: root: DD:FC:DA:54:1E:75:77:AD:DC:A8:7E:88:27:A9:8A:50:60:32:52:A5 "._("and")." class3: A7:C4:8F:BE:6B:02:6D:BD:0E:C1:B4:65:B8:8D:D8:13:EE:1D:EF:A0"),0,0,'C');

This comment has been minimized.

Copy link
@kronenpj

kronenpj Dec 13, 2018

I would suggest using the same format for SHA1 and SHA256. I prefer the 4-character chunks with spaces vs. the 2-character chunks with colons, but that's a personal preference and that's not how openssl displays the fingerprints.

$this->ln(3);
$this->Cell(0,0, recode($_SESSION['_config']['recode'], "SHA256: root: 07ED BD82 4A49 88CF EF42 15DA 20D4 8C2B 41D7 1529 D7C9 00F5 7092 6F27 7CC2 30C5 "._("and")." class3: F687 3D70 D675 96C2 ACBA 3440 1E69 738B 5270 1DD6 AB06 B497 49BC 5515 0936 D544"),0,0,'C');
$this->SetLineWidth(0.05); // added 3 points to the abcissa 43 -> 46 to get second line fingerprints
$this->Line(1, 46, $this->w - 1, 46);
$this->SetLineWidth(0.2);
}
@@ -71,7 +73,7 @@ function Body($name = "", $dob = "", $email = "", $assurer = "", $date = "", $ma
$date = date("Y-m-d");
// Show text blurb at top of page
$this->SetY(45);
$this->SetY(48); // added 3 points to the abcissa 45 -> 48 to get second line fingerprints
$this->SetFont('Arial','',10);
if($_SESSION['_config']['language'] == "ja")
$this->SetFont('SJIS','',10);
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.