Skip to content

Commit

Permalink
Merge remote-tracking branch 'freebsd/releng/13.2' into truenas/13.1-…
Browse files Browse the repository at this point in the history
…stable
  • Loading branch information
amotin committed Sep 28, 2023
2 parents f18737d + a1c915c commit 5f730f4
Show file tree
Hide file tree
Showing 27 changed files with 2,123 additions and 21 deletions.
17 changes: 17 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,23 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.

20230906:
13.2-RELEASE-p3 FreeBSD-EN-23:09.freebsd-update
FreeBSD-EN-23:10.pci
FreeBSD-EN-23:11.caroot
FreeBSD-SA-23:10.pf
FreeBSD-SA-23:11.wifi

freebsd-update incorrectly merges files on upgrade [EN-23:09.freebsd-update]

PCI-e hot-plug is broken with certain devices [EN-23:10.pci-update]

Root certificate bundle update [EN-23:11.caroot]

pf incorrectly handles multiple IPv6 fragment headers [SA-23:10.pf]

Wi-Fi encryption bypass [SA-23:11.wifi]

20230801:
13.2-RELEASE-p2 FreeBSD-EN-23:08.vnet
FreeBSD-SA-23:06.ipv6
Expand Down
135 changes: 135 additions & 0 deletions secure/caroot/trusted/BJCA_Global_Root_CA1.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
##
## BJCA Global Root CA1
##
## This is a single X.509 certificate for a public Certificate
## Authority (CA). It was automatically extracted from Mozilla's
## root CA list (the file `certdata.txt' in security/nss).
##
## It contains a certificate trusted for server authentication.
##
## Extracted from nss
## with $FreeBSD$
##
## @generated
##
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
55:6f:65:e3:b4:d9:90:6a:1b:09:d1:6c:3e:c0:6c:20
Signature Algorithm: sha256WithRSAEncryption
Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1
Validity
Not Before: Dec 19 03:16:17 2019 GMT
Not After : Dec 12 03:16:17 2044 GMT
Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
RSA Public-Key: (4096 bit)
Modulus:
00:f1:66:08:bd:d9:c5:15:61:cb:84:04:41:a5:69:
37:77:1d:c1:b0:7b:fa:c3:77:48:90:13:72:64:d1:
b8:7c:90:35:9d:18:79:88:e3:97:01:3c:47:81:f2:
0e:a2:98:0d:9e:3f:37:e0:19:b2:90:f2:46:1c:92:
b1:3a:61:ce:fa:b7:46:9e:03:86:d7:33:6e:ed:f7:
45:8c:76:37:de:6e:96:91:f7:d7:7e:2b:87:17:d5:
8b:35:ee:84:91:72:57:dc:60:c3:c3:b9:e7:c7:67:
24:23:4f:63:0a:63:f6:66:7d:4b:55:a7:3f:78:64:
49:69:12:97:e0:4c:0d:d3:09:a0:32:30:3a:fa:9f:
c0:f2:9c:c5:12:2a:2e:1c:b5:04:33:da:a4:38:11:
6a:de:c6:18:f6:47:3a:22:41:87:22:fc:c4:89:28:
54:d8:8c:a5:30:0a:f8:17:16:ca:ac:37:fd:79:a7:
91:17:78:38:99:ad:58:ed:b2:de:cc:89:7d:03:9c:
b3:89:65:e7:e3:3b:b1:22:86:8f:06:6d:78:07:fd:
91:12:7f:b0:6b:1c:89:0d:f9:b8:cb:74:5b:07:c2:
c8:f4:35:d1:64:63:7a:e9:6e:9a:28:d6:30:bd:e6:
1b:dd:15:af:84:ea:9c:c7:ca:f5:0e:ea:f2:5d:29:
87:8f:69:73:39:be:2e:24:6f:45:21:ac:c5:d4:69:
25:06:83:ad:7a:48:85:13:2c:0d:06:b8:6c:79:56:
fc:a3:67:32:81:f5:57:a5:ca:57:42:69:e9:5c:24:
61:ef:e2:30:18:4e:44:98:55:6f:7a:c2:93:d8:19:
b6:de:7c:47:8a:11:4e:49:47:db:28:94:02:0b:94:
4a:2c:f9:12:d0:4f:e8:31:7e:6c:7a:bf:a6:3f:9b:
39:3d:02:16:a3:18:b3:67:ac:5b:3f:2c:83:2b:67:
39:81:5c:b9:7e:94:d5:64:dd:9e:8f:6e:ae:e8:7c:
5b:b4:d7:6a:47:48:d7:7e:b3:d4:2d:8e:56:76:4e:
cf:69:f1:6e:44:6c:d4:24:ea:8d:24:a1:18:bf:bd:
57:fe:a9:99:35:b5:db:10:77:b8:3d:48:ba:d6:c1:
e7:f1:23:3e:d7:df:85:9d:27:3c:d4:40:bd:0a:0c:
bd:f5:e7:8d:25:d6:81:74:87:46:d4:29:75:a2:42:
6c:f7:73:89:e7:7d:bf:7a:4a:1f:d3:22:c9:15:55:
cf:df:6f:7c:55:d0:a4:8b:07:11:37:5f:83:a6:26:
57:a6:01:5b:7e:fe:58:68:07:a9:e9:7a:d9:b9:e8:
ff:50:1f:ab:c2:b4:c0:ce:e8:ea:fd:0f:bd:8d:4d:
b8:bc:71
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Subject Key Identifier:
C5:EF:ED:CC:D8:8D:21:C6:48:E4:E3:D7:14:2E:A7:16:93:E5:98:01
X509v3 Basic Constraints: critical
CA:TRUE
X509v3 Key Usage: critical
Certificate Sign, CRL Sign
Signature Algorithm: sha256WithRSAEncryption
52:82:ac:21:34:1f:23:f2:a2:d8:f9:b8:af:37:36:20:89:d1:
37:03:d6:69:9f:b8:61:10:ba:a2:31:98:59:47:e8:d1:0d:25:
1e:15:41:0c:e0:2a:55:d5:57:52:cb:f8:e4:c7:69:a3:1d:4d:
71:02:5e:5f:21:45:60:48:5c:09:8e:49:10:c1:04:dc:a9:62:
6b:02:f0:43:c8:4e:9d:38:49:74:c9:32:70:54:6d:c1:47:fc:
8e:b4:36:9e:d4:9c:bd:dd:20:d6:53:c9:18:a9:b5:56:b9:76:
8b:95:67:66:ee:bd:98:fe:ae:ef:be:6e:fb:60:f6:fd:59:c6:
2a:1b:3f:23:4a:94:24:30:27:c8:89:bc:eb:44:24:9a:cb:3d:
be:4f:d5:7a:ce:8e:17:cb:62:c1:d9:de:1e:0e:7a:ff:43:86:
34:52:bc:61:3f:3c:5f:bb:d9:76:b4:53:bc:97:b3:fe:8a:4c:
12:2e:2b:f3:d7:ce:e1:a2:ff:dd:7b:70:fb:3b:a1:4d:a4:63:
02:fd:38:97:95:3f:05:70:a0:6b:df:62:81:43:8b:b4:59:0d:
4a:8c:54:9c:c5:bb:81:9f:cd:7d:a5:ef:0b:25:1e:3a:20:db:
1c:fc:1f:98:67:02:0a:d4:73:44:13:db:51:84:1a:55:03:56:
e0:00:7e:74:06:ff:38:c4:72:1d:d3:a8:3f:68:31:5d:d3:09:
c7:2e:8c:5b:63:e0:e8:dc:1e:d2:ec:61:1e:f2:de:e5:ef:f6:
99:76:60:2d:1e:94:72:71:c6:0b:2a:32:c7:92:4e:d5:46:d7:
1d:f9:a9:19:0a:c8:fa:95:ce:6d:23:98:aa:0b:38:ad:9a:56:
0d:6f:8d:f1:31:00:88:c1:17:9c:cd:19:36:35:fe:55:53:a0:
e0:3c:33:5f:96:5e:e2:32:e9:df:33:bb:06:4a:a9:d8:84:73:
ce:77:d2:c6:ac:71:e1:5c:a3:1d:0c:bb:0a:df:5f:e2:a3:71:
d8:da:37:5a:a0:78:2b:f4:d4:7d:eb:76:ed:f2:61:70:a5:65:
9a:d3:89:34:18:ab:fb:72:3e:d7:b4:3d:79:5c:d8:1f:a1:33:
7b:d9:82:50:0c:93:17:aa:6c:dc:c2:82:bb:02:57:36:af:98:
27:2a:39:50:e1:b0:89:f5:25:97:7e:47:68:10:b4:ec:73:ca:
b3:97:d1:24:dc:f6:62:a0:28:d3:b5:a3:b8:64:b7:88:62:42:
cf:9d:53:cd:99:be:64:68:8f:4f:1e:12:48:f7:d2:29:c3:98:
28:ca:f2:32:0b:93:8c:29:4f:3c:60:32:cd:05:96:61:ec:f2:
af:fe:b3:70:2c:2e:a6:f2
SHA1 Fingerprint=D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A
-----BEGIN CERTIFICATE-----
MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU
MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI
T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz
MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF
SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh
bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z
xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ
spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5
58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR
at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll
5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq
nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK
V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/
pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO
z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn
jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+
WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF
7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli
awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u
+2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88
X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN
SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo
P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI
+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz
znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9
eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2
YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy
r/6zcCwupvI=
-----END CERTIFICATE-----
67 changes: 67 additions & 0 deletions secure/caroot/trusted/BJCA_Global_Root_CA2.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
##
## BJCA Global Root CA2
##
## This is a single X.509 certificate for a public Certificate
## Authority (CA). It was automatically extracted from Mozilla's
## root CA list (the file `certdata.txt' in security/nss).
##
## It contains a certificate trusted for server authentication.
##
## Extracted from nss
## with $FreeBSD$
##
## @generated
##
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
2c:17:08:7d:64:2a:c0:fe:85:18:59:06:cf:b4:4a:eb
Signature Algorithm: ecdsa-with-SHA384
Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2
Validity
Not Before: Dec 19 03:18:21 2019 GMT
Not After : Dec 12 03:18:21 2044 GMT
Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2
Subject Public Key Info:
Public Key Algorithm: id-ecPublicKey
Public-Key: (384 bit)
pub:
04:9d:cb:80:91:8d:53:67:b5:b9:50:b1:03:f8:e5:
49:1f:41:22:09:b0:51:52:58:d6:2b:34:8f:c5:12:
46:14:c5:8b:2f:2c:84:ff:2c:6e:a8:d5:f1:09:e3:
03:21:14:c4:43:3d:7c:c1:2c:c4:4b:6a:4a:cd:e9:
87:e0:7d:f6:22:be:fa:4a:51:b8:30:8a:fd:e1:de:
18:12:0a:f6:47:b7:e7:17:bf:27:8a:d4:41:4c:96:
3c:60:96:c1:fd:15:1c
ASN1 OID: secp384r1
NIST CURVE: P-384
X509v3 extensions:
X509v3 Subject Key Identifier:
D2:4A:B1:51:7F:06:F0:D1:82:1F:4E:6E:5F:AB:83:FC:48:D4:B0:91
X509v3 Basic Constraints: critical
CA:TRUE
X509v3 Key Usage: critical
Certificate Sign, CRL Sign
Signature Algorithm: ecdsa-with-SHA384
30:65:02:30:1a:bc:5b:d7:fe:a9:d2:54:0e:4a:5d:d2:6d:b1:
40:dc:f4:43:d5:d2:4a:99:19:12:56:80:f7:83:34:e1:35:4e:
48:6d:04:0f:57:31:30:30:2d:b1:aa:9d:03:38:db:06:02:31:
00:cb:cc:87:53:cb:7a:df:20:51:73:90:c0:a8:5b:61:d0:c5:
50:39:fd:85:fe:c1:e3:78:f8:a6:d6:4b:bd:9b:87:8f:0f:e5:
d6:53:96:ab:3c:c8:40:da:61:f7:53:a3:f7
SHA1 Fingerprint=F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6
-----BEGIN CERTIFICATE-----
MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw
CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ
VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy
MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ
TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS
b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B
IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+
+kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK
sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA
94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B
43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
-----END CERTIFICATE-----
66 changes: 66 additions & 0 deletions secure/caroot/trusted/Certainly_Root_E1.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
##
## Certainly Root E1
##
## This is a single X.509 certificate for a public Certificate
## Authority (CA). It was automatically extracted from Mozilla's
## root CA list (the file `certdata.txt' in security/nss).
##
## It contains a certificate trusted for server authentication.
##
## Extracted from nss
## with $FreeBSD$
##
## @generated
##
Certificate:
Data:
Version: 3 (0x2)
Serial Number:
06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8
Signature Algorithm: ecdsa-with-SHA384
Issuer: C = US, O = Certainly, CN = Certainly Root E1
Validity
Not Before: Apr 1 00:00:00 2021 GMT
Not After : Apr 1 00:00:00 2046 GMT
Subject: C = US, O = Certainly, CN = Certainly Root E1
Subject Public Key Info:
Public Key Algorithm: id-ecPublicKey
Public-Key: (384 bit)
pub:
04:de:6f:f8:7f:1c:df:ed:f9:47:87:86:b1:a4:c0:
8a:f8:82:97:80:ea:8f:c8:4a:5e:2a:7d:88:68:a7:
01:62:14:91:24:7a:5c:9e:a3:17:7d:8a:86:21:34:
18:50:1b:10:de:d0:37:4b:26:c7:19:60:80:e9:34:
bd:60:19:36:40:d6:29:87:09:3c:91:7a:f6:bc:13:
23:dd:59:4e:04:5e:cf:c8:02:1c:18:53:c1:31:d8:
da:20:e9:44:8d:e4:76
ASN1 OID: secp384r1
NIST CURVE: P-384
X509v3 extensions:
X509v3 Key Usage: critical
Certificate Sign, CRL Sign
X509v3 Basic Constraints: critical
CA:TRUE
X509v3 Subject Key Identifier:
F3:28:18:CB:64:75:EE:29:2A:EB:ED:AE:23:58:38:85:EB:C8:22:07
Signature Algorithm: ecdsa-with-SHA384
30:65:02:31:00:b1:8e:5a:20:c3:b2:19:62:4d:de:b0:4f:df:
6e:d2:70:8a:f1:9f:7e:6a:8c:e6:ba:de:83:69:ca:69:b3:a9:
05:b5:96:92:17:87:c2:d2:ea:d0:7b:ce:d8:41:5b:7c:ae:02:
30:46:de:ea:cb:5d:9a:ec:32:c2:65:16:b0:4c:30:5c:30:f3:
da:4e:73:86:06:d8:ce:89:04:48:37:37:f8:dd:33:51:9d:70:
af:7b:55:d8:01:2e:7d:05:64:0e:86:b8:91
SHA1 Fingerprint=F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B
-----BEGIN CERTIFICATE-----
MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQsw
CQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlu
bHkgUm9vdCBFMTAeFw0yMTA0MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJ
BgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlubHkxGjAYBgNVBAMTEUNlcnRhaW5s
eSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4fxzf7flHh4axpMCK
+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9YBk2
QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8E
BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4
hevIIgcwCgYIKoZIzj0EAwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozm
ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG
BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
-----END CERTIFICATE-----
Loading

0 comments on commit 5f730f4

Please sign in to comment.