Skip to content

Commit 908d48f

Browse files
authored
feat: switch back to upstream pkcs8 lib (#47763)
* feat: switch back to upstream pkcs8 lib * Update tls_helper.go * lint: make notice
1 parent 78d71d3 commit 908d48f

File tree

4 files changed

+38
-77
lines changed

4 files changed

+38
-77
lines changed

NOTICE.txt

Lines changed: 32 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10667,11 +10667,11 @@ SOFTWARE
1066710667

1066810668
--------------------------------------------------------------------------------
1066910669
Dependency : github.com/elastic/elastic-agent-libs
10670-
Version: v0.26.0
10670+
Version: v0.26.2
1067110671
Licence type (autodetected): Apache-2.0
1067210672
--------------------------------------------------------------------------------
1067310673

10674-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].0/LICENSE:
10674+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE:
1067510675

1067610676
Apache License
1067710677
Version 2.0, January 2004
@@ -14350,36 +14350,6 @@ See the License for the specific language governing permissions and
1435014350
limitations under the License.
1435114351

1435214352

14353-
--------------------------------------------------------------------------------
14354-
Dependency : github.com/elastic/pkcs8
14355-
Version: v1.0.0
14356-
Licence type (autodetected): MIT
14357-
--------------------------------------------------------------------------------
14358-
14359-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE:
14360-
14361-
The MIT License (MIT)
14362-
14363-
Copyright (c) 2014 youmark
14364-
14365-
Permission is hereby granted, free of charge, to any person obtaining a copy
14366-
of this software and associated documentation files (the "Software"), to deal
14367-
in the Software without restriction, including without limitation the rights
14368-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14369-
copies of the Software, and to permit persons to whom the Software is
14370-
furnished to do so, subject to the following conditions:
14371-
14372-
The above copyright notice and this permission notice shall be included in all
14373-
copies or substantial portions of the Software.
14374-
14375-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14376-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14377-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14378-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
14379-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
14380-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
14381-
SOFTWARE.
14382-
1438314353
--------------------------------------------------------------------------------
1438414354
Dependency : github.com/elastic/sarama
1438514355
Version: v1.19.1-0.20250603175145-7672917f26b6
@@ -21182,6 +21152,36 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg-go/[email protected]/LIC
2118221152
of your accepting any such warranty or additional liability.
2118321153

2118421154

21155+
--------------------------------------------------------------------------------
21156+
Dependency : github.com/youmark/pkcs8
21157+
Version: v0.0.0-20240726163527-a2c0da244d78
21158+
Licence type (autodetected): MIT
21159+
--------------------------------------------------------------------------------
21160+
21161+
Contents of probable licence file $GOMODCACHE/github.com/youmark/[email protected]/LICENSE:
21162+
21163+
The MIT License (MIT)
21164+
21165+
Copyright (c) 2014 youmark
21166+
21167+
Permission is hereby granted, free of charge, to any person obtaining a copy
21168+
of this software and associated documentation files (the "Software"), to deal
21169+
in the Software without restriction, including without limitation the rights
21170+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
21171+
copies of the Software, and to permit persons to whom the Software is
21172+
furnished to do so, subject to the following conditions:
21173+
21174+
The above copyright notice and this permission notice shall be included in all
21175+
copies or substantial portions of the Software.
21176+
21177+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21178+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21179+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21180+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21181+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21182+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21183+
SOFTWARE.
21184+
2118521185
--------------------------------------------------------------------------------
2118621186
Dependency : github.com/zyedidia/generic
2118721187
Version: v1.2.1
@@ -65764,36 +65764,6 @@ Redistribution and use in source and binary forms, with or without modification,
6576465764
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6576565765

6576665766

65767-
--------------------------------------------------------------------------------
65768-
Dependency : github.com/youmark/pkcs8
65769-
Version: v0.0.0-20240726163527-a2c0da244d78
65770-
Licence type (autodetected): MIT
65771-
--------------------------------------------------------------------------------
65772-
65773-
Contents of probable licence file $GOMODCACHE/github.com/youmark/[email protected]/LICENSE:
65774-
65775-
The MIT License (MIT)
65776-
65777-
Copyright (c) 2014 youmark
65778-
65779-
Permission is hereby granted, free of charge, to any person obtaining a copy
65780-
of this software and associated documentation files (the "Software"), to deal
65781-
in the Software without restriction, including without limitation the rights
65782-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
65783-
copies of the Software, and to permit persons to whom the Software is
65784-
furnished to do so, subject to the following conditions:
65785-
65786-
The above copyright notice and this permission notice shall be included in all
65787-
copies or substantial portions of the Software.
65788-
65789-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
65790-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
65791-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
65792-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
65793-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
65794-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
65795-
SOFTWARE.
65796-
6579765767
--------------------------------------------------------------------------------
6579865768
Dependency : github.com/yuin/gopher-lua
6579965769
Version: v1.1.1

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ require (
6969
github.com/elastic/go-sysinfo v1.15.3
7070
github.com/elastic/go-ucfg v0.8.8
7171
github.com/elastic/gosigar v0.14.3
72-
github.com/elastic/pkcs8 v1.0.0
7372
github.com/fatih/color v1.16.0 // indirect
7473
github.com/fearful-symmetry/gorapl v0.0.4
7574
github.com/fsnotify/fsevents v0.1.1
@@ -173,7 +172,7 @@ require (
173172
github.com/elastic/bayeux v1.0.5
174173
github.com/elastic/ebpfevents v0.8.0
175174
github.com/elastic/elastic-agent-autodiscover v0.10.0
176-
github.com/elastic/elastic-agent-libs v0.26.0
175+
github.com/elastic/elastic-agent-libs v0.26.2
177176
github.com/elastic/elastic-agent-system-metrics v0.13.4
178177
github.com/elastic/go-elasticsearch/v8 v8.19.0
179178
github.com/elastic/go-freelru v0.16.0
@@ -237,6 +236,7 @@ require (
237236
github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102
238237
github.com/forensicanalysis/fslib v0.15.2
239238
github.com/mattn/go-sqlite3 v1.14.32
239+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
240240
go.opentelemetry.io/collector/client v1.45.0
241241
go.opentelemetry.io/collector/component/componenttest v0.139.0
242242
go.opentelemetry.io/collector/config/configauth v1.45.0
@@ -431,7 +431,6 @@ require (
431431
github.com/x448/float16 v0.8.4 // indirect
432432
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
433433
github.com/xdg-go/stringprep v1.0.4 // indirect
434-
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
435434
github.com/yusufpapurcu/wmi v1.2.4 // indirect
436435
github.com/zeebo/errs v1.4.0 // indirect
437436
github.com/zeebo/xxh3 v1.0.2 // indirect

go.sum

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@ github.com/elastic/elastic-agent-autodiscover v0.10.0 h1:WJ4zl9uSfk1kHmn2B/0byQB
374374
github.com/elastic/elastic-agent-autodiscover v0.10.0/go.mod h1:Nf3zh9FcJ9nTTswTwDTUAqXmvQllOrNliM6xmORSxwE=
375375
github.com/elastic/elastic-agent-client/v7 v7.15.0 h1:nDB7v8TBoNuD6IIzC3z7Q0y+7bMgXoT2DsHfolO2CHE=
376376
github.com/elastic/elastic-agent-client/v7 v7.15.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
377-
github.com/elastic/elastic-agent-libs v0.26.0 h1:ne+cNu2fleCzHm2z0tkAKwVH0EByJRi7r7TgIr3YKio=
378-
github.com/elastic/elastic-agent-libs v0.26.0/go.mod h1:o/iXtbHYaojpG4BOY7Z3hFMQAgEoqq2owO17JPGpf3A=
377+
github.com/elastic/elastic-agent-libs v0.26.2 h1:zwytPWmTWSJG80oa9/5FJ6zue47ysI23eMo15LfeWy0=
378+
github.com/elastic/elastic-agent-libs v0.26.2/go.mod h1:fc2noLqosmQorIGbatJfVeh4CL77yiP8ot16/5umeoM=
379379
github.com/elastic/elastic-agent-system-metrics v0.13.4 h1:gX8VdlQyakPcPKFpD7uHv2QLRDyguuKfZgu0LE27V7c=
380380
github.com/elastic/elastic-agent-system-metrics v0.13.4/go.mod h1:lB8veYWYBlA9eF6TahmPN87G1IEgWlbep7QSqLSW90U=
381381
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
@@ -428,8 +428,6 @@ github.com/elastic/mito v1.24.0 h1:JFviWHsJOepVuIgARirMwe9My/NXkEht5c/j0KptrRM=
428428
github.com/elastic/mito v1.24.0/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s=
429429
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw=
430430
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0=
431-
github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA=
432-
github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0=
433431
github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6 h1:2COw7kzXkIyS4hKNUl5qw0KolrwncrY4VVNpngVNo8I=
434432
github.com/elastic/sarama v1.19.1-0.20250603175145-7672917f26b6/go.mod h1:Ua/oXS4NS+U/pp/urxgzEGWd1MvocHA+yd4Bu4+Eb80=
435433
github.com/elastic/tk-btf v0.2.0 h1:8Am3b2mNIoG7RIoD6EVCnhhrdJySuAUUnnkaCU3EGAM=
@@ -1258,8 +1256,6 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
12581256
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
12591257
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
12601258
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
1261-
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
1262-
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
12631259
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
12641260
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
12651261
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1304,7 +1300,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
13041300
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
13051301
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
13061302
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
1307-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
13081303
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
13091304
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
13101305
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1361,8 +1356,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13611356
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13621357
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13631358
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1364-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1365-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
13661359
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
13671360
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
13681361
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
@@ -1373,8 +1366,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
13731366
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
13741367
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
13751368
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
1376-
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
1377-
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
13781369
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
13791370
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
13801371
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

libbeat/otelbeat/oteltest/tls_helper.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ import (
2626
"path/filepath"
2727
"testing"
2828

29+
"github.com/youmark/pkcs8"
30+
2931
"github.com/elastic/elastic-agent-libs/transport/tlscommontest"
30-
"github.com/elastic/pkcs8"
3132
)
3233

3334
// GetClientCerts creates client certificates, writes them to a file and return the path of certificate and key

0 commit comments

Comments
 (0)