mirror of
https://github.com/opnsense/src.git
synced 2026-06-07 15:52:40 -04:00
Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz Differential Revision: https://reviews.freebsd.org/D38835 Test Plan: ``` $ git status On branch vendor/openssl-3.0 nothing to commit, working tree clean $ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.8 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/ngie/.gnupg/pubring.kbx ----------------------------- pub rsa4096 2014-10-04 [SC] 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C uid [ unknown] Richard Levitte <richard@levitte.org> uid [ unknown] Richard Levitte <levitte@lp.se> uid [ unknown] Richard Levitte <levitte@openssl.org> sub rsa4096 2014-10-04 [E] $ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Feb 7 05:43:55 2023 PST gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown] gpg: aka "Richard Levitte <levitte@lp.se>" [unknown] gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C $ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old) On branch vendor/openssl-3.0 nothing to commit, working tree clean $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . $ cat .git gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout $ diff -arq ../openssl-3.0.8 . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 nothing to commit, working tree clean $ ``` Reviewers: emaste, jkim Subscribers: imp, andrew, dab Differential Revision: https://reviews.freebsd.org/D38835
140 lines
2.8 KiB
Perl
140 lines
2.8 KiB
Perl
#! /usr/bin/env perl
|
|
# Copyright 1998-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
# this file except in compliance with the License. You can obtain a copy
|
|
# in the file LICENSE in the source distribution or at
|
|
# https://www.openssl.org/source/license.html
|
|
|
|
use strict;
|
|
use FindBin;
|
|
use lib "$FindBin::Bin/../../util/perl";
|
|
use OpenSSL::copyright;
|
|
|
|
my %xref_tbl;
|
|
my %oid_tbl;
|
|
|
|
my ($mac_file, $xref_file) = @ARGV;
|
|
|
|
# The year the output file is generated.
|
|
my $YEAR = OpenSSL::copyright::latest(($0, $mac_file, $xref_file));
|
|
|
|
open(IN, $mac_file) || die "Can't open $mac_file, $!\n";
|
|
|
|
# Read in OID nid values for a lookup table.
|
|
|
|
while (<IN>)
|
|
{
|
|
s|\R$||; # Better chomp
|
|
my ($name, $num) = /^(\S+)\s+(\S+)$/;
|
|
$oid_tbl{$name} = $num;
|
|
}
|
|
close IN;
|
|
|
|
open(IN, $xref_file) || die "Can't open $xref_file, $!\n";
|
|
|
|
my $ln = 1;
|
|
|
|
while (<IN>)
|
|
{
|
|
s|\R$||; # Better chomp
|
|
s/#.*$//;
|
|
next if (/^\S*$/);
|
|
my ($xr, $p1, $p2) = /^(\S+)\s+(\S+)\s+(\S+)/;
|
|
check_oid($xr);
|
|
check_oid($p1);
|
|
check_oid($p2);
|
|
$xref_tbl{$xr} = [$p1, $p2, $ln];
|
|
}
|
|
|
|
my @xrkeys = keys %xref_tbl;
|
|
|
|
my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
|
|
|
|
my $i;
|
|
for($i = 0; $i <= $#srt1; $i++)
|
|
{
|
|
$xref_tbl{$srt1[$i]}[2] = $i;
|
|
}
|
|
|
|
my @srt2 = sort
|
|
{
|
|
my$ap1 = $oid_tbl{$xref_tbl{$a}[0]};
|
|
my$bp1 = $oid_tbl{$xref_tbl{$b}[0]};
|
|
return $ap1 - $bp1 if ($ap1 != $bp1);
|
|
my$ap2 = $oid_tbl{$xref_tbl{$a}[1]};
|
|
my$bp2 = $oid_tbl{$xref_tbl{$b}[1]};
|
|
|
|
return $ap2 - $bp2;
|
|
} @xrkeys;
|
|
|
|
my $pname = $0;
|
|
$pname =~ s|.*/||;
|
|
|
|
print <<EOF;
|
|
/*
|
|
* WARNING: do not edit!
|
|
* Generated by $pname
|
|
*
|
|
* Copyright 1998-$YEAR The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
|
|
typedef struct {
|
|
int sign_id;
|
|
int hash_id;
|
|
int pkey_id;
|
|
} nid_triple;
|
|
|
|
DEFINE_STACK_OF(nid_triple)
|
|
|
|
static const nid_triple sigoid_srt[] = {
|
|
EOF
|
|
|
|
foreach (@srt1)
|
|
{
|
|
my $xr = $_;
|
|
my ($p1, $p2) = @{$xref_tbl{$_}};
|
|
my $o1 = " {NID_$xr, NID_$p1,";
|
|
my $o2 = "NID_$p2},";
|
|
if (length("$o1 $o2") < 78)
|
|
{
|
|
print "$o1 $o2\n";
|
|
}
|
|
else
|
|
{
|
|
print "$o1\n $o2\n";
|
|
}
|
|
}
|
|
|
|
print "};";
|
|
print <<EOF;
|
|
|
|
|
|
static const nid_triple *const sigoid_srt_xref[] = {
|
|
EOF
|
|
|
|
foreach (@srt2)
|
|
{
|
|
my ($p1, $p2, $x) = @{$xref_tbl{$_}};
|
|
# If digest or signature algorithm is "undef" then the algorithm
|
|
# needs special handling and is excluded from the cross reference table.
|
|
next if $p1 eq "undef" || $p2 eq "undef";
|
|
print " \&sigoid_srt\[$x\],\n";
|
|
}
|
|
|
|
print "};\n";
|
|
|
|
sub check_oid
|
|
{
|
|
my ($chk) = @_;
|
|
if (!exists $oid_tbl{$chk})
|
|
{
|
|
die "Can't find \"$chk\"\n";
|
|
}
|
|
}
|