From 997c29dbdab50c8be05af640c1ffc03aa2a7ddcb Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosthegajdos@gmail.com>
Date: Thu, 15 Aug 2024 09:53:39 +0100
Subject: [PATCH 1/5] ci: fix GHA CI build matrix

It would appear that requesting Go 1.21 in the build matrix has no
effect whatsoever on what go toolchain is actually used to build the
project.

Specifying 1.22.0 in the go.mod go directive forces the 1.22 toolchain
to be used for building Go source files, ignoring whatever Go version we
set in the GHA CI matrix.

Luckily we can enforce the right setting by setting GOTOOLCHAIN=local
which forces Go to use the locally available toolchain instead of
downloading the one requested by go.mod.

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
---
 .github/workflows/build.yml | 6 ++++++
 go.mod                      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a2adce7c..13ecc8c41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,12 @@ permissions:
 
 jobs:
   test:
+    env:
+      # Setting GOTOOLCHAIN to local tells go
+      # to to use the bundled Go version rather
+      # than fetching the tolchain according to
+      # toolchain directive found in go.mod.
+      GOTOOLCHAIN: local
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
diff --git a/go.mod b/go.mod
index 576628968..0ca423f7f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/distribution/distribution/v3
 
-go 1.22.0
+go 1.21.0
 
 require (
 	cloud.google.com/go/storage v1.30.1

From be0051c4526f1962f67fbeac4ed28e2786006e9d Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosthegajdos@gmail.com>
Date: Thu, 15 Aug 2024 10:09:48 +0100
Subject: [PATCH 2/5] Run vendor on 1.21

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
---
 .../testdata/client_intermediate_cert.der        | Bin 0 -> 998 bytes
 .../certverifier/testdata/client_leaf_cert.der   | Bin 0 -> 1147 bytes
 .../certverifier/testdata/client_root_cert.der   | Bin 0 -> 1013 bytes
 .../testdata/server_intermediate_cert.der        | Bin 0 -> 998 bytes
 .../certverifier/testdata/server_leaf_cert.der   | Bin 0 -> 1147 bytes
 .../certverifier/testdata/server_root_cert.der   | Bin 0 -> 1013 bytes
 .../v2/remotesigner/testdata/client_cert.der     | Bin 0 -> 1013 bytes
 .../v2/remotesigner/testdata/server_cert.der     | Bin 0 -> 1013 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
 create mode 100644 vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..958f3cfaddf3645fa6c0578b5b6955d65ac4c172
GIT binary patch
literal 998
zcmXqLVt!=M#B^!_GZP~dlZfxTkgMw#Mx5CteAhsdS=K*t&xAY!UN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Gec7&Lt`^z^C)p%6J+ina%mHz5^^vyvNA9?G4eAQ
zG%<29H8C<W9Nt&6Og&yK;BEQ+&)lC6TkJXAv2-f0Nr{K_j%4;<{u$jO6aNcHY8t(~
zqy9y&-1Lzs?~BsEkFGl8R8RP>nfQWlH+Myj<F(Sn!hQWyYraPcCEBrtXFWTArbgzD
zm5IZ{bD=fd*)4ZeK5z9e=XhyZ+3(MM(MSL5oWy@hr_^6Rn|+8eIXzO*Cp*6;N>Tjz
z2Bjk+Ub9TzT(Z$!`+w1f9a{SYn?h^$U$mDJKK^KOurlxGlhf8coXvjW^}bgt-rFjD
znHJ|Xo9Wew;}%JlW_Kjsthc+chb^XXpU3LOdy_KCS4OTntgUFd?YsGkV{8gPCrIUU
z7xZ1<|6Oe5g44&3J$ODp>G5YKW=00a#V!U;2J*mEAgjzGVIbBZvce&_^W7!+r|T*d
zavIkkZ(n>dQ`LY6q(GR3)qt6i@xOr}h$qOxWx&zImXe>Fn2DZTf#J-^uui3sYst!#
z{ImS~I{#0uS#WDz%!i-3yIxOGkAC<p^jwU<)XyikaNa8oiP79sW{{liX=%#*`SJI8
zMcYgrntF|<A2Po$Z~L`udV^0!W9`!87p^3hsecxJ7d1D__DG4$xz}g@S(q)=657eI
zRakm`-?5C8>KhN$DyM2L{LbrkL@xJCpY3crHP)J~LHEx;nsZlX$z1Na++S~*x&F8L
zSHsIX`Pf;-7fz4f$yxWfRV}c$Te2$X#22gkrUlwjtNp9{IiD}~zjo}z)1J=iJoj~z
zPFk$n)~eK8B%5+0@w1g$N8H(l+-H4!LOMmyS_+%b`$^TD`}g=z?!9=Gts-l=GE2@y
HTP6bly#{pd

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..d2817641bafb022339926786ab85b545f40ac665
GIT binary patch
literal 1147
zcmXqLVktLhVvb+H%*4pVB*OPMYW498DSV5WgVNVW|Jr8oCgimNFB_*;n@8JsUPeZ4
zRtAH{c0+ChPB!LH7B*p~&|nycgNMo4(NM@h03^fC!x>zfmseSqn3HNKV890w<Kkg=
z&d)7K%&RmMG~fq`aPx4uWR_(XXXfV_iW!K2gqV4Fi;WWFOHzwV;*(R0N(`k8B;eL_
zGKz6mR8~0vv0ie1u7R95uaS{~nW3qXp^2fPag;c(2{LyOxwMH<2{{-USs9p{82K3t
zni#p5niv@wo;*yPCCXlYe?^B-(;DHW%6oSHT^;mIIyZa%%0}@fp3IN`n3U=!8oYmC
zx$Bx#esbWw!c%jdQ)h2XXzh~a-c}{E)#88C^IglkPyd|owRl08L`B~JwZ4vz-YZX7
zv)Ce6;FhjT*5j|PsSB=h^Bd2ec&K!u5=Zc_35w@VJ#yyRmHBj^jY_lT!^g4v8)Z{&
zrj~|YSf1kBW!8JC{`HU5msIM4=9xBV3EoX;JHkB6EoRyG>6yxnyM_06xZQcZ?W<Su
zO^scC0W1Ifow;&jPR_ckj7N?Jt}ry&qVQ_v_NEP`5+}F*Uw>@M4y!->Y40>Qzg1y0
z&gNQpqF{|c>D+ZZ(rFIKEL_n{%!~|-iyLnkG+s4m+z3nvvdS!tD-9Z#Eo|&v(%3b4
zVzNoZ_g%=<^$R1;>=M3fAjvH2AGv2jo&gWY$-*qG2F#3%{|y8|JV6#N1CA!Pl>FSp
z%sk}C2j(GQ<TElTpY@M^tCo8#OWd4A>()!XwH^ngbB~t_{rh@w&h5|n>_#Tt3odjy
zuPCdY_u)fF^#8=jc^^+Q{aqN5`$@Gm({I-q6VU_LtQOD6naL>j(`V|D&;QI6%^$Dc
z@$uH$=blqSKTV1FFaEpmVP=>@<Nv4E^jE8jxIUOsm|y+YPIku{xm}zZ;ymZ3En<+r
ze0yiM+SH!gGfiI2V)$EU-5^uEV1L#G8<(&WFQa{D>vvi*Y`l|mqO|ORNA0oIS8nOI
z?NiA8%5=ljL@D29-OKpueEYz|zv5rHb554&taa#n7142tpUKWU?R-O_r^0)6j>G3Y
aOB;Xxy<$H9NT-Uzt(mu6i*GEf3IzZ)c%0q<

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..d8c3710c85f9ff41ddfc709924c866350a727a4f
GIT binary patch
literal 1013
zcmXqLV*Y5*#B_53GZP~dlZa+<DywMROZSz%tV%tN{wd=1kCqwmvT<s)d9;1!Wn|=L
zWiV)LH{>?pWMd9xVH0Kw4Tf<zc$l0W4TTH@Kr-w+oWZ4ed6i{}IjM#M27DkfE*^I0
z{M>@Xyh=ks1AdSQHxGwPW?5!&W`3Tbn1KjLh?$4C*eEf+B(=CCJ~_3h#8ApW0&YDg
zqZoHZWt9UE>m}#s8pw(B8W|aw8XFoJ7#JIxMv3#90J%nHQ0^ddX%nLoaxgNoGB7tW
z@-rATF>*0AF)}hdZr#y6M}F(|x(>G^%gcAlKWcTb*S((Se#vIyuMojqJ6T@W9G$-N
zZ|C3aC}V-ru$PA$a>||`V5!;WvLO9;#Z4xLTYkS~Q%%)mH+DGbsA<2rr@8F$Psyk!
zC02_czBy5RY)XCG=Yl1DX=(>VSrdJ-C#|hK7^zn?b35awX<K}+vVPvN>)f$Ntvf$$
zcUg9sL1fPSDbXqWt6$VVZu~MYZrj`2y}fI?80UuXsujC8ao09pzRe<Bw;hfu$Qhop
zchzEJ&%VmpUZ?MM>SEFH3&Hjk;!&j?yPw^7|NHlfMLseyY=TyHB}&&4U!T;kt&%Ic
z-@@f=`1w!pGyVU%zJI$PWGYXZ;?Bg($iTQb*dWkA7MKcT`B=nQL{>NicfPwM|8!l2
zLQdoQ<L!$tW~v&<gQS&NBn-qFuqyy1ELmYj#{Vp=2FySTIoN@z7Z~h}4F12&IEtO8
zzk97xB~UcG{~OPm@Zh%#mp`jr!}#xmdhKZ?iB>tUFt($qvv(cdI=i6tz3tUW`|a0C
z&5N-8^H(H$?psgMz!}<?=eS*uc<N)`vF62T!8ej=XMIv1aC^+(al1<W$U&js>^;s&
z=?+d?)Hkg%emvc~QLj+DwRvTMu)Tl4_m}{_7kTC1{xNsF-p9krsM-B)Ge_#Kiu#~{
zd67^5U(N6lVcaug+5}Tw2V+f_-BCNQyG;7WAZ_<^`6QjCrOhu7&ztq4tdo7t^%&>)
zT<y)NGjrG(I^DL<%h_YG%;0fd{;U~)n&$qEY`gxqr`BI{wMf|2<hvV^>R0VF*I2Sr
HHQW{e5x{wf

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..dae619c097512f20d09d2054c63fc0f715d7be24
GIT binary patch
literal 998
zcmXqLVt!=M#B^!_GZP~dlZZk6mxvepr#-!NVoqOL*`yn*LOZ7#@Un4gwRyCC=VfH%
zW@RvFY&YaK;ACSCWnmL$3Jr#FICz+x9SwyH1VA$EJe<L$d3lv(i8-l;0tS2_F)ki<
z=ltA)#JoyFK?8n}2saOhOJ-SSab|v=p_qXPNQjw-x7a8#z9hA{BtAK{sKijpKmu+(
zC!-j5MP-!(5bGu9=Nia~^BNf$m>HTH8JZfJT11KSnjmurkxQExm5_sxk(GhDiIJbd
zpox)-sfm%1VO{t`EzVyWX$3+}`kJnrGQY>^=jnZyz4d%;|IQeuB_Gcfo1a{_>B5Fg
zXYbI=4K*7QZdjc*51-)~EjRzyir2SPA5Z@zcTLeXV*g^*2f0P(7p>c<z3aD;l~DF-
z&y#Bf+eN<I+xS*y8W(fvK_;!G(z3m4|C#Kb9Pou@(IH8%FE=m7OPTD5QT~77iSK^n
zj?mc?Ig0vzyqYN4#&<SiohMgM?Dt+@*6v*6oEHh_p1eC{%)E7#x1FVt+=r@^WjxM8
zW%EyEH!b#_{r32dR#^#;1N%=sP8KS(uV2~rZtk&H%Pp6?9b0gk#Wua^Sp3nLmF_Fr
z^{Q6{3P}Dei<=kX_FPV0XQCk!Gb01zViyA^19@O7kX2@pFc51H;hEsb-IKY0Mj+Q>
z?c<>#uh>H(ryKBq6bQ4h8Za|5{x=W=@dR183^<zDQu1>XGxLzc8JJvw;mpWjp+5Pu
z!*l<vg@Hn^|6H3WFE%rH_O6Mx$4~F}75{kIX^Q{N_aEEtdi^dfyYuqN153{c9<x(*
zYdJSpoI8JDrlP)M@bsM5GdX^7^2B_v?%Pq_uy)Rp40V~)ZM&xLxg&orKe$?SmHfLW
zM+@(Y>q#5Sb^i@`a>klJNjzx%iu)2*?h3yy-gEL(;p^g~mZo#n!wzh9Qua5C+wfRd
ztarh_l9E{Oro7&WNVTl@3-~vy&EDU;)-f|r-8<&mQ>C=;``&D2+5V0(pW(g3o1}Sj
z^gY793Mi&+ntK1`1tm%ENt=U{rb%k1PtbRHEhYTylqR?8HqOeuvA1fBY>pc~NUFTR
KZE!sDzAgX``fm0B

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..ce7f8d31d6802c7e68c188af8797c3a063894857
GIT binary patch
literal 1147
zcmXqLVktLhVvb+H%*4pVB%&$)xidhT`$ARBi)~L`p2_<Bs<SiTW#iOp^Jx3d%gD&h
z%3#pgZpdxG$;KSY!Y0fV8Vuub@Gv<$8VVT*fMnQtID<>`@+!*`b5acj4ER7|Ts-W~
z`MCv&d6kBO2K*oqZXOPo%(Bel%=|n<F#{2h5Hk;Nu~A}tNosLPd~#}0iJ_E%1l)Q~
zMltS+$|?sS)=SRMHINhMH8L_VGc*N~2F8|A;=Crv+(G2hCPpRXU}R)vU~XdMXE11D
z<YH=KWMnwdp|;EFuK1za(r!=pH!pdapOn20ODNE9)SoP}k&l0M<Yt4fD{D3!e!kB@
zc<t7$<tvSK%O@U~a`;wH_zxp@;pdC=Rpbo!KR+&YDrLj=eQ#&lY&#_t*TZ!uqu`wW
z!G_X(FZVpWbXz6QaV@ia%<J<jF1Ng0@MMN>TUzhK>3dC_Z(le%bCn$9moio9jI@8{
zd;5%c{XT!(ig$;5K+$bpwI6ChVmse+UV1r`!RY5*U#A%ppFJxS>PX#w$sz7*X_R~A
zg!|$g&z66XI$)aW-TrxDio@fp!U<u!W?ji&nY8lfa`lt@jKrIsRbE{6F}h`%#kDZ!
zd!LiH?o+UrI(7BuhhCZaq4rG7j0}v68*dmiUNvak2uujF$}Ej54H}m%Z0udq*fn@!
zvPs0C{!7G*{nMUaIx(j&t!&bbRiT|z4R}CK7G_~JU}j|eZy*Tb39@h*a5S-{<mV=4
z<{?KuFb@GEpOGOu^N;8i_bKT<dl^?bw^j;Yn9^@AZr#e#TcxkMRoadBAxnGj&t(^#
z4l?$opGm9R@@vcG*RxwDMPHH#kiIDAAQ*8<t2CVRO;97(@t$R#-z=}Gyz<!o^x9e5
zb=T!hE#=<3r7UUvxhU%8_W8O+jv8uR_S<Ck?B_nyoho`$<ih#;Px=xk{W+poY+Lel
z+AcQpgJ+(^1(!Y*nei^cK*_`V@Y3Z!Em!BYGcT-={bt=_-1yCIN}6r@fyN+<o6^i`
zi*_!%BgnkrSm1{3b%w{L7j>^sS#+*GdHMB|H?BTf!^g~J_=D$Y-Ot{~xpTg~G+{k6
Zdr{DieczoQDL-a%Ib3(Tsv+bGCjf+Ap-TV&

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..04b0d73600b72f80a03943d41973b279db9e8b32
GIT binary patch
literal 1013
zcmXqLV*Y5*#B_53GZP~dlZb{E^N!s~snriRh?%)HJiGKl>CAisUN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Q)5FT0|N^q(<pIX6Cl^f49XouE^T5|LJmeoRtDxK
zMt%l^CPpr%CPqevMO%MAzV7_kyv>aL-(RkWjuO*nCZC(^b4{<TlG&~yN@J19pEn;a
zWz7h#JIf!hf8K}VIE(lB)-1neDdIJgBhJ~#aQ(1)CH894|9yW$ZgvD6*ig3MoTKrN
z5YLr%E~_{06xp-kn$GoWZ;EX0y=8E15#qbI>cp%V+e53*PfoZW)2DU5BJN^Jypf0+
z%dyqB7eAAEDfH_&Z*6C3aP8^9M)sYbgC^`~v;4F5#oepTLYl5+2bdY(i!-?My>4G)
z&8u+L`?_9LxQB1$HP?fpd*5i(-|SJJ!`sZHa8UZu(QeP3Dc(Yr8?G#iY20z>);Fh$
zMQ>DZHkC%KUBdEb&cYv;1sHCx@Vv~#%*epFIM^W2Ko*z^WcgUcSVVXxICA%7?w=9J
zwOIRjXviz}kjUu<@*rtt76}8f2J8wz2}@R(k?}tZs{u2RLJoFd>IDWnBZI}4y?mP{
zW+WALO{`uTY0T-O8uy=9`&z_;*e^$wYu3!Wz-Re-&a7vV%g_8h++q8CMf&zxTFdl~
zp5i+{-R9L&+mdUFEBoKr@u=5M->UQ>MNWJ7BRi)4^M4~B*uKhe`J%yAbG&-Thr?bk
zCap<joG92Ab~%`p;q(Xph%cKxrj_-3$828a&2wkQxk)>+`USuL4V}qf=6kBV_EFAN
zmIn*31Qb`P{oxd|=2o5l$|&AdTJ_-*k&5oDQvTTOiN8OjczyHyta<w9_es3h)~)%z
z&sP2UiroQq_v`0ApCc*mlF9S=tYWC6Yrt7^ud93ynYaCXy0?8#+xAHp9!)yGM(r3c
JpX9EclL5Omdg1^8

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..d8c3710c85f9ff41ddfc709924c866350a727a4f
GIT binary patch
literal 1013
zcmXqLV*Y5*#B_53GZP~dlZa+<DywMROZSz%tV%tN{wd=1kCqwmvT<s)d9;1!Wn|=L
zWiV)LH{>?pWMd9xVH0Kw4Tf<zc$l0W4TTH@Kr-w+oWZ4ed6i{}IjM#M27DkfE*^I0
z{M>@Xyh=ks1AdSQHxGwPW?5!&W`3Tbn1KjLh?$4C*eEf+B(=CCJ~_3h#8ApW0&YDg
zqZoHZWt9UE>m}#s8pw(B8W|aw8XFoJ7#JIxMv3#90J%nHQ0^ddX%nLoaxgNoGB7tW
z@-rATF>*0AF)}hdZr#y6M}F(|x(>G^%gcAlKWcTb*S((Se#vIyuMojqJ6T@W9G$-N
zZ|C3aC}V-ru$PA$a>||`V5!;WvLO9;#Z4xLTYkS~Q%%)mH+DGbsA<2rr@8F$Psyk!
zC02_czBy5RY)XCG=Yl1DX=(>VSrdJ-C#|hK7^zn?b35awX<K}+vVPvN>)f$Ntvf$$
zcUg9sL1fPSDbXqWt6$VVZu~MYZrj`2y}fI?80UuXsujC8ao09pzRe<Bw;hfu$Qhop
zchzEJ&%VmpUZ?MM>SEFH3&Hjk;!&j?yPw^7|NHlfMLseyY=TyHB}&&4U!T;kt&%Ic
z-@@f=`1w!pGyVU%zJI$PWGYXZ;?Bg($iTQb*dWkA7MKcT`B=nQL{>NicfPwM|8!l2
zLQdoQ<L!$tW~v&<gQS&NBn-qFuqyy1ELmYj#{Vp=2FySTIoN@z7Z~h}4F12&IEtO8
zzk97xB~UcG{~OPm@Zh%#mp`jr!}#xmdhKZ?iB>tUFt($qvv(cdI=i6tz3tUW`|a0C
z&5N-8^H(H$?psgMz!}<?=eS*uc<N)`vF62T!8ej=XMIv1aC^+(al1<W$U&js>^;s&
z=?+d?)Hkg%emvc~QLj+DwRvTMu)Tl4_m}{_7kTC1{xNsF-p9krsM-B)Ge_#Kiu#~{
zd67^5U(N6lVcaug+5}Tw2V+f_-BCNQyG;7WAZ_<^`6QjCrOhu7&ztq4tdo7t^%&>)
zT<y)NGjrG(I^DL<%h_YG%;0fd{;U~)n&$qEY`gxqr`BI{wMf|2<hvV^>R0VF*I2Sr
HHQW{e5x{wf

literal 0
HcmV?d00001

diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..04b0d73600b72f80a03943d41973b279db9e8b32
GIT binary patch
literal 1013
zcmXqLV*Y5*#B_53GZP~dlZb{E^N!s~snriRh?%)HJiGKl>CAisUN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Q)5FT0|N^q(<pIX6Cl^f49XouE^T5|LJmeoRtDxK
zMt%l^CPpr%CPqevMO%MAzV7_kyv>aL-(RkWjuO*nCZC(^b4{<TlG&~yN@J19pEn;a
zWz7h#JIf!hf8K}VIE(lB)-1neDdIJgBhJ~#aQ(1)CH894|9yW$ZgvD6*ig3MoTKrN
z5YLr%E~_{06xp-kn$GoWZ;EX0y=8E15#qbI>cp%V+e53*PfoZW)2DU5BJN^Jypf0+
z%dyqB7eAAEDfH_&Z*6C3aP8^9M)sYbgC^`~v;4F5#oepTLYl5+2bdY(i!-?My>4G)
z&8u+L`?_9LxQB1$HP?fpd*5i(-|SJJ!`sZHa8UZu(QeP3Dc(Yr8?G#iY20z>);Fh$
zMQ>DZHkC%KUBdEb&cYv;1sHCx@Vv~#%*epFIM^W2Ko*z^WcgUcSVVXxICA%7?w=9J
zwOIRjXviz}kjUu<@*rtt76}8f2J8wz2}@R(k?}tZs{u2RLJoFd>IDWnBZI}4y?mP{
zW+WALO{`uTY0T-O8uy=9`&z_;*e^$wYu3!Wz-Re-&a7vV%g_8h++q8CMf&zxTFdl~
zp5i+{-R9L&+mdUFEBoKr@u=5M->UQ>MNWJ7BRi)4^M4~B*uKhe`J%yAbG&-Thr?bk
zCap<joG92Ab~%`p;q(Xph%cKxrj_-3$828a&2wkQxk)>+`USuL4V}qf=6kBV_EFAN
zmIn*31Qb`P{oxd|=2o5l$|&AdTJ_-*k&5oDQvTTOiN8OjczyHyta<w9_es3h)~)%z
z&sP2UiroQq_v`0ApCc*mlF9S=tYWC6Yrt7^ud93ynYaCXy0?8#+xAHp9!)yGM(r3c
JpX9EclL5Omdg1^8

literal 0
HcmV?d00001


From 88579792f60445d67eb8b72653b1775a8ff25940 Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosthegajdos@gmail.com>
Date: Thu, 15 Aug 2024 11:28:24 +0100
Subject: [PATCH 3/5] Fix a typo in GHA build workflow comment

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13ecc8c41..2c573f6ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     env:
       # Setting GOTOOLCHAIN to local tells go
       # to to use the bundled Go version rather
-      # than fetching the tolchain according to
+      # than fetching the toolchain according to
       # toolchain directive found in go.mod.
       GOTOOLCHAIN: local
     runs-on: ubuntu-latest

From 6df0fd941cfa12f1d23d8048ee09cc66086ef91f Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosthegajdos@gmail.com>
Date: Tue, 15 Oct 2024 10:49:13 +0100
Subject: [PATCH 4/5] Bump go version in go.mod

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
---
 go.mod                                           |   2 +-
 .../testdata/client_intermediate_cert.der        | Bin 998 -> 0 bytes
 .../certverifier/testdata/client_leaf_cert.der   | Bin 1147 -> 0 bytes
 .../certverifier/testdata/client_root_cert.der   | Bin 1013 -> 0 bytes
 .../testdata/server_intermediate_cert.der        | Bin 998 -> 0 bytes
 .../certverifier/testdata/server_leaf_cert.der   | Bin 1147 -> 0 bytes
 .../certverifier/testdata/server_root_cert.der   | Bin 1013 -> 0 bytes
 .../v2/remotesigner/testdata/client_cert.der     | Bin 1013 -> 0 bytes
 .../v2/remotesigner/testdata/server_cert.der     | Bin 1013 -> 0 bytes
 9 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
 delete mode 100644 vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der

diff --git a/go.mod b/go.mod
index 0ca423f7f..576628968 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/distribution/distribution/v3
 
-go 1.21.0
+go 1.22.0
 
 require (
 	cloud.google.com/go/storage v1.30.1
diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
deleted file mode 100644
index 958f3cfaddf3645fa6c0578b5b6955d65ac4c172..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 998
zcmXqLVt!=M#B^!_GZP~dlZfxTkgMw#Mx5CteAhsdS=K*t&xAY!UN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Gec7&Lt`^z^C)p%6J+ina%mHz5^^vyvNA9?G4eAQ
zG%<29H8C<W9Nt&6Og&yK;BEQ+&)lC6TkJXAv2-f0Nr{K_j%4;<{u$jO6aNcHY8t(~
zqy9y&-1Lzs?~BsEkFGl8R8RP>nfQWlH+Myj<F(Sn!hQWyYraPcCEBrtXFWTArbgzD
zm5IZ{bD=fd*)4ZeK5z9e=XhyZ+3(MM(MSL5oWy@hr_^6Rn|+8eIXzO*Cp*6;N>Tjz
z2Bjk+Ub9TzT(Z$!`+w1f9a{SYn?h^$U$mDJKK^KOurlxGlhf8coXvjW^}bgt-rFjD
znHJ|Xo9Wew;}%JlW_Kjsthc+chb^XXpU3LOdy_KCS4OTntgUFd?YsGkV{8gPCrIUU
z7xZ1<|6Oe5g44&3J$ODp>G5YKW=00a#V!U;2J*mEAgjzGVIbBZvce&_^W7!+r|T*d
zavIkkZ(n>dQ`LY6q(GR3)qt6i@xOr}h$qOxWx&zImXe>Fn2DZTf#J-^uui3sYst!#
z{ImS~I{#0uS#WDz%!i-3yIxOGkAC<p^jwU<)XyikaNa8oiP79sW{{liX=%#*`SJI8
zMcYgrntF|<A2Po$Z~L`udV^0!W9`!87p^3hsecxJ7d1D__DG4$xz}g@S(q)=657eI
zRakm`-?5C8>KhN$DyM2L{LbrkL@xJCpY3crHP)J~LHEx;nsZlX$z1Na++S~*x&F8L
zSHsIX`Pf;-7fz4f$yxWfRV}c$Te2$X#22gkrUlwjtNp9{IiD}~zjo}z)1J=iJoj~z
zPFk$n)~eK8B%5+0@w1g$N8H(l+-H4!LOMmyS_+%b`$^TD`}g=z?!9=Gts-l=GE2@y
HTP6bly#{pd

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
deleted file mode 100644
index d2817641bafb022339926786ab85b545f40ac665..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1147
zcmXqLVktLhVvb+H%*4pVB*OPMYW498DSV5WgVNVW|Jr8oCgimNFB_*;n@8JsUPeZ4
zRtAH{c0+ChPB!LH7B*p~&|nycgNMo4(NM@h03^fC!x>zfmseSqn3HNKV890w<Kkg=
z&d)7K%&RmMG~fq`aPx4uWR_(XXXfV_iW!K2gqV4Fi;WWFOHzwV;*(R0N(`k8B;eL_
zGKz6mR8~0vv0ie1u7R95uaS{~nW3qXp^2fPag;c(2{LyOxwMH<2{{-USs9p{82K3t
zni#p5niv@wo;*yPCCXlYe?^B-(;DHW%6oSHT^;mIIyZa%%0}@fp3IN`n3U=!8oYmC
zx$Bx#esbWw!c%jdQ)h2XXzh~a-c}{E)#88C^IglkPyd|owRl08L`B~JwZ4vz-YZX7
zv)Ce6;FhjT*5j|PsSB=h^Bd2ec&K!u5=Zc_35w@VJ#yyRmHBj^jY_lT!^g4v8)Z{&
zrj~|YSf1kBW!8JC{`HU5msIM4=9xBV3EoX;JHkB6EoRyG>6yxnyM_06xZQcZ?W<Su
zO^scC0W1Ifow;&jPR_ckj7N?Jt}ry&qVQ_v_NEP`5+}F*Uw>@M4y!->Y40>Qzg1y0
z&gNQpqF{|c>D+ZZ(rFIKEL_n{%!~|-iyLnkG+s4m+z3nvvdS!tD-9Z#Eo|&v(%3b4
zVzNoZ_g%=<^$R1;>=M3fAjvH2AGv2jo&gWY$-*qG2F#3%{|y8|JV6#N1CA!Pl>FSp
z%sk}C2j(GQ<TElTpY@M^tCo8#OWd4A>()!XwH^ngbB~t_{rh@w&h5|n>_#Tt3odjy
zuPCdY_u)fF^#8=jc^^+Q{aqN5`$@Gm({I-q6VU_LtQOD6naL>j(`V|D&;QI6%^$Dc
z@$uH$=blqSKTV1FFaEpmVP=>@<Nv4E^jE8jxIUOsm|y+YPIku{xm}zZ;ymZ3En<+r
ze0yiM+SH!gGfiI2V)$EU-5^uEV1L#G8<(&WFQa{D>vvi*Y`l|mqO|ORNA0oIS8nOI
z?NiA8%5=ljL@D29-OKpueEYz|zv5rHb554&taa#n7142tpUKWU?R-O_r^0)6j>G3Y
aOB;Xxy<$H9NT-Uzt(mu6i*GEf3IzZ)c%0q<

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
deleted file mode 100644
index d8c3710c85f9ff41ddfc709924c866350a727a4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmXqLV*Y5*#B_53GZP~dlZa+<DywMROZSz%tV%tN{wd=1kCqwmvT<s)d9;1!Wn|=L
zWiV)LH{>?pWMd9xVH0Kw4Tf<zc$l0W4TTH@Kr-w+oWZ4ed6i{}IjM#M27DkfE*^I0
z{M>@Xyh=ks1AdSQHxGwPW?5!&W`3Tbn1KjLh?$4C*eEf+B(=CCJ~_3h#8ApW0&YDg
zqZoHZWt9UE>m}#s8pw(B8W|aw8XFoJ7#JIxMv3#90J%nHQ0^ddX%nLoaxgNoGB7tW
z@-rATF>*0AF)}hdZr#y6M}F(|x(>G^%gcAlKWcTb*S((Se#vIyuMojqJ6T@W9G$-N
zZ|C3aC}V-ru$PA$a>||`V5!;WvLO9;#Z4xLTYkS~Q%%)mH+DGbsA<2rr@8F$Psyk!
zC02_czBy5RY)XCG=Yl1DX=(>VSrdJ-C#|hK7^zn?b35awX<K}+vVPvN>)f$Ntvf$$
zcUg9sL1fPSDbXqWt6$VVZu~MYZrj`2y}fI?80UuXsujC8ao09pzRe<Bw;hfu$Qhop
zchzEJ&%VmpUZ?MM>SEFH3&Hjk;!&j?yPw^7|NHlfMLseyY=TyHB}&&4U!T;kt&%Ic
z-@@f=`1w!pGyVU%zJI$PWGYXZ;?Bg($iTQb*dWkA7MKcT`B=nQL{>NicfPwM|8!l2
zLQdoQ<L!$tW~v&<gQS&NBn-qFuqyy1ELmYj#{Vp=2FySTIoN@z7Z~h}4F12&IEtO8
zzk97xB~UcG{~OPm@Zh%#mp`jr!}#xmdhKZ?iB>tUFt($qvv(cdI=i6tz3tUW`|a0C
z&5N-8^H(H$?psgMz!}<?=eS*uc<N)`vF62T!8ej=XMIv1aC^+(al1<W$U&js>^;s&
z=?+d?)Hkg%emvc~QLj+DwRvTMu)Tl4_m}{_7kTC1{xNsF-p9krsM-B)Ge_#Kiu#~{
zd67^5U(N6lVcaug+5}Tw2V+f_-BCNQyG;7WAZ_<^`6QjCrOhu7&ztq4tdo7t^%&>)
zT<y)NGjrG(I^DL<%h_YG%;0fd{;U~)n&$qEY`gxqr`BI{wMf|2<hvV^>R0VF*I2Sr
HHQW{e5x{wf

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
deleted file mode 100644
index dae619c097512f20d09d2054c63fc0f715d7be24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 998
zcmXqLVt!=M#B^!_GZP~dlZZk6mxvepr#-!NVoqOL*`yn*LOZ7#@Un4gwRyCC=VfH%
zW@RvFY&YaK;ACSCWnmL$3Jr#FICz+x9SwyH1VA$EJe<L$d3lv(i8-l;0tS2_F)ki<
z=ltA)#JoyFK?8n}2saOhOJ-SSab|v=p_qXPNQjw-x7a8#z9hA{BtAK{sKijpKmu+(
zC!-j5MP-!(5bGu9=Nia~^BNf$m>HTH8JZfJT11KSnjmurkxQExm5_sxk(GhDiIJbd
zpox)-sfm%1VO{t`EzVyWX$3+}`kJnrGQY>^=jnZyz4d%;|IQeuB_Gcfo1a{_>B5Fg
zXYbI=4K*7QZdjc*51-)~EjRzyir2SPA5Z@zcTLeXV*g^*2f0P(7p>c<z3aD;l~DF-
z&y#Bf+eN<I+xS*y8W(fvK_;!G(z3m4|C#Kb9Pou@(IH8%FE=m7OPTD5QT~77iSK^n
zj?mc?Ig0vzyqYN4#&<SiohMgM?Dt+@*6v*6oEHh_p1eC{%)E7#x1FVt+=r@^WjxM8
zW%EyEH!b#_{r32dR#^#;1N%=sP8KS(uV2~rZtk&H%Pp6?9b0gk#Wua^Sp3nLmF_Fr
z^{Q6{3P}Dei<=kX_FPV0XQCk!Gb01zViyA^19@O7kX2@pFc51H;hEsb-IKY0Mj+Q>
z?c<>#uh>H(ryKBq6bQ4h8Za|5{x=W=@dR183^<zDQu1>XGxLzc8JJvw;mpWjp+5Pu
z!*l<vg@Hn^|6H3WFE%rH_O6Mx$4~F}75{kIX^Q{N_aEEtdi^dfyYuqN153{c9<x(*
zYdJSpoI8JDrlP)M@bsM5GdX^7^2B_v?%Pq_uy)Rp40V~)ZM&xLxg&orKe$?SmHfLW
zM+@(Y>q#5Sb^i@`a>klJNjzx%iu)2*?h3yy-gEL(;p^g~mZo#n!wzh9Qua5C+wfRd
ztarh_l9E{Oro7&WNVTl@3-~vy&EDU;)-f|r-8<&mQ>C=;``&D2+5V0(pW(g3o1}Sj
z^gY793Mi&+ntK1`1tm%ENt=U{rb%k1PtbRHEhYTylqR?8HqOeuvA1fBY>pc~NUFTR
KZE!sDzAgX``fm0B

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
deleted file mode 100644
index ce7f8d31d6802c7e68c188af8797c3a063894857..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1147
zcmXqLVktLhVvb+H%*4pVB%&$)xidhT`$ARBi)~L`p2_<Bs<SiTW#iOp^Jx3d%gD&h
z%3#pgZpdxG$;KSY!Y0fV8Vuub@Gv<$8VVT*fMnQtID<>`@+!*`b5acj4ER7|Ts-W~
z`MCv&d6kBO2K*oqZXOPo%(Bel%=|n<F#{2h5Hk;Nu~A}tNosLPd~#}0iJ_E%1l)Q~
zMltS+$|?sS)=SRMHINhMH8L_VGc*N~2F8|A;=Crv+(G2hCPpRXU}R)vU~XdMXE11D
z<YH=KWMnwdp|;EFuK1za(r!=pH!pdapOn20ODNE9)SoP}k&l0M<Yt4fD{D3!e!kB@
zc<t7$<tvSK%O@U~a`;wH_zxp@;pdC=Rpbo!KR+&YDrLj=eQ#&lY&#_t*TZ!uqu`wW
z!G_X(FZVpWbXz6QaV@ia%<J<jF1Ng0@MMN>TUzhK>3dC_Z(le%bCn$9moio9jI@8{
zd;5%c{XT!(ig$;5K+$bpwI6ChVmse+UV1r`!RY5*U#A%ppFJxS>PX#w$sz7*X_R~A
zg!|$g&z66XI$)aW-TrxDio@fp!U<u!W?ji&nY8lfa`lt@jKrIsRbE{6F}h`%#kDZ!
zd!LiH?o+UrI(7BuhhCZaq4rG7j0}v68*dmiUNvak2uujF$}Ej54H}m%Z0udq*fn@!
zvPs0C{!7G*{nMUaIx(j&t!&bbRiT|z4R}CK7G_~JU}j|eZy*Tb39@h*a5S-{<mV=4
z<{?KuFb@GEpOGOu^N;8i_bKT<dl^?bw^j;Yn9^@AZr#e#TcxkMRoadBAxnGj&t(^#
z4l?$opGm9R@@vcG*RxwDMPHH#kiIDAAQ*8<t2CVRO;97(@t$R#-z=}Gyz<!o^x9e5
zb=T!hE#=<3r7UUvxhU%8_W8O+jv8uR_S<Ck?B_nyoho`$<ih#;Px=xk{W+poY+Lel
z+AcQpgJ+(^1(!Y*nei^cK*_`V@Y3Z!Em!BYGcT-={bt=_-1yCIN}6r@fyN+<o6^i`
zi*_!%BgnkrSm1{3b%w{L7j>^sS#+*GdHMB|H?BTf!^g~J_=D$Y-Ot{~xpTg~G+{k6
Zdr{DieczoQDL-a%Ib3(Tsv+bGCjf+Ap-TV&

diff --git a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
deleted file mode 100644
index 04b0d73600b72f80a03943d41973b279db9e8b32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmXqLV*Y5*#B_53GZP~dlZb{E^N!s~snriRh?%)HJiGKl>CAisUN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Q)5FT0|N^q(<pIX6Cl^f49XouE^T5|LJmeoRtDxK
zMt%l^CPpr%CPqevMO%MAzV7_kyv>aL-(RkWjuO*nCZC(^b4{<TlG&~yN@J19pEn;a
zWz7h#JIf!hf8K}VIE(lB)-1neDdIJgBhJ~#aQ(1)CH894|9yW$ZgvD6*ig3MoTKrN
z5YLr%E~_{06xp-kn$GoWZ;EX0y=8E15#qbI>cp%V+e53*PfoZW)2DU5BJN^Jypf0+
z%dyqB7eAAEDfH_&Z*6C3aP8^9M)sYbgC^`~v;4F5#oepTLYl5+2bdY(i!-?My>4G)
z&8u+L`?_9LxQB1$HP?fpd*5i(-|SJJ!`sZHa8UZu(QeP3Dc(Yr8?G#iY20z>);Fh$
zMQ>DZHkC%KUBdEb&cYv;1sHCx@Vv~#%*epFIM^W2Ko*z^WcgUcSVVXxICA%7?w=9J
zwOIRjXviz}kjUu<@*rtt76}8f2J8wz2}@R(k?}tZs{u2RLJoFd>IDWnBZI}4y?mP{
zW+WALO{`uTY0T-O8uy=9`&z_;*e^$wYu3!Wz-Re-&a7vV%g_8h++q8CMf&zxTFdl~
zp5i+{-R9L&+mdUFEBoKr@u=5M->UQ>MNWJ7BRi)4^M4~B*uKhe`J%yAbG&-Thr?bk
zCap<joG92Ab~%`p;q(Xph%cKxrj_-3$828a&2wkQxk)>+`USuL4V}qf=6kBV_EFAN
zmIn*31Qb`P{oxd|=2o5l$|&AdTJ_-*k&5oDQvTTOiN8OjczyHyta<w9_es3h)~)%z
z&sP2UiroQq_v`0ApCc*mlF9S=tYWC6Yrt7^ud93ynYaCXy0?8#+xAHp9!)yGM(r3c
JpX9EclL5Omdg1^8

diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
deleted file mode 100644
index d8c3710c85f9ff41ddfc709924c866350a727a4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmXqLV*Y5*#B_53GZP~dlZa+<DywMROZSz%tV%tN{wd=1kCqwmvT<s)d9;1!Wn|=L
zWiV)LH{>?pWMd9xVH0Kw4Tf<zc$l0W4TTH@Kr-w+oWZ4ed6i{}IjM#M27DkfE*^I0
z{M>@Xyh=ks1AdSQHxGwPW?5!&W`3Tbn1KjLh?$4C*eEf+B(=CCJ~_3h#8ApW0&YDg
zqZoHZWt9UE>m}#s8pw(B8W|aw8XFoJ7#JIxMv3#90J%nHQ0^ddX%nLoaxgNoGB7tW
z@-rATF>*0AF)}hdZr#y6M}F(|x(>G^%gcAlKWcTb*S((Se#vIyuMojqJ6T@W9G$-N
zZ|C3aC}V-ru$PA$a>||`V5!;WvLO9;#Z4xLTYkS~Q%%)mH+DGbsA<2rr@8F$Psyk!
zC02_czBy5RY)XCG=Yl1DX=(>VSrdJ-C#|hK7^zn?b35awX<K}+vVPvN>)f$Ntvf$$
zcUg9sL1fPSDbXqWt6$VVZu~MYZrj`2y}fI?80UuXsujC8ao09pzRe<Bw;hfu$Qhop
zchzEJ&%VmpUZ?MM>SEFH3&Hjk;!&j?yPw^7|NHlfMLseyY=TyHB}&&4U!T;kt&%Ic
z-@@f=`1w!pGyVU%zJI$PWGYXZ;?Bg($iTQb*dWkA7MKcT`B=nQL{>NicfPwM|8!l2
zLQdoQ<L!$tW~v&<gQS&NBn-qFuqyy1ELmYj#{Vp=2FySTIoN@z7Z~h}4F12&IEtO8
zzk97xB~UcG{~OPm@Zh%#mp`jr!}#xmdhKZ?iB>tUFt($qvv(cdI=i6tz3tUW`|a0C
z&5N-8^H(H$?psgMz!}<?=eS*uc<N)`vF62T!8ej=XMIv1aC^+(al1<W$U&js>^;s&
z=?+d?)Hkg%emvc~QLj+DwRvTMu)Tl4_m}{_7kTC1{xNsF-p9krsM-B)Ge_#Kiu#~{
zd67^5U(N6lVcaug+5}Tw2V+f_-BCNQyG;7WAZ_<^`6QjCrOhu7&ztq4tdo7t^%&>)
zT<y)NGjrG(I^DL<%h_YG%;0fd{;U~)n&$qEY`gxqr`BI{wMf|2<hvV^>R0VF*I2Sr
HHQW{e5x{wf

diff --git a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der
deleted file mode 100644
index 04b0d73600b72f80a03943d41973b279db9e8b32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmXqLV*Y5*#B_53GZP~dlZb{E^N!s~snriRh?%)HJiGKl>CAisUN%mxHjlRNyo`+8
ztPBQ??S|Y2oNUaYENsF|p}{Z?2M?38qoI(207!<Nhcmb|FR!vJF(=hfz<>`V#>K<#
zoS$2em{(~iXuuB=;pX9R$t=q(&dkp<6f+P32{H5V78@nTm!uY##3!c~l^9AHNWiV<
zWEA7BsH}1TV!h=2Tmw0AULzv|Q)5FT0|N^q(<pIX6Cl^f49XouE^T5|LJmeoRtDxK
zMt%l^CPpr%CPqevMO%MAzV7_kyv>aL-(RkWjuO*nCZC(^b4{<TlG&~yN@J19pEn;a
zWz7h#JIf!hf8K}VIE(lB)-1neDdIJgBhJ~#aQ(1)CH894|9yW$ZgvD6*ig3MoTKrN
z5YLr%E~_{06xp-kn$GoWZ;EX0y=8E15#qbI>cp%V+e53*PfoZW)2DU5BJN^Jypf0+
z%dyqB7eAAEDfH_&Z*6C3aP8^9M)sYbgC^`~v;4F5#oepTLYl5+2bdY(i!-?My>4G)
z&8u+L`?_9LxQB1$HP?fpd*5i(-|SJJ!`sZHa8UZu(QeP3Dc(Yr8?G#iY20z>);Fh$
zMQ>DZHkC%KUBdEb&cYv;1sHCx@Vv~#%*epFIM^W2Ko*z^WcgUcSVVXxICA%7?w=9J
zwOIRjXviz}kjUu<@*rtt76}8f2J8wz2}@R(k?}tZs{u2RLJoFd>IDWnBZI}4y?mP{
zW+WALO{`uTY0T-O8uy=9`&z_;*e^$wYu3!Wz-Re-&a7vV%g_8h++q8CMf&zxTFdl~
zp5i+{-R9L&+mdUFEBoKr@u=5M->UQ>MNWJ7BRi)4^M4~B*uKhe`J%yAbG&-Thr?bk
zCap<joG92Ab~%`p;q(Xph%cKxrj_-3$828a&2wkQxk)>+`USuL4V}qf=6kBV_EFAN
zmIn*31Qb`P{oxd|=2o5l$|&AdTJ_-*k&5oDQvTTOiN8OjczyHyta<w9_es3h)~)%z
z&sP2UiroQq_v`0ApCc*mlF9S=tYWC6Yrt7^ud93ynYaCXy0?8#+xAHp9!)yGM(r3c
JpX9EclL5Omdg1^8


From b9b96d9dfac06d64b9c20186c631c0930277485f Mon Sep 17 00:00:00 2001
From: Milos Gajdos <milosthegajdos@gmail.com>
Date: Tue, 15 Oct 2024 10:54:37 +0100
Subject: [PATCH 5/5] Bump Go version in Dockerfiles

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
---
 .github/workflows/build.yml   | 4 ++--
 Dockerfile                    | 2 +-
 dockerfiles/docs.Dockerfile   | 2 +-
 dockerfiles/git.Dockerfile    | 2 +-
 dockerfiles/lint.Dockerfile   | 2 +-
 dockerfiles/vendor.Dockerfile | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c573f6ed..7055ada10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,8 +33,8 @@ jobs:
       fail-fast: false
       matrix:
         go:
-          - 1.21.12
-          - 1.22.5
+          - 1.22.8
+          - 1.23.2
         target:
           - test-coverage
           - test-cloud-storage
diff --git a/Dockerfile b/Dockerfile
index 0a1430aff..ff73b49f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.5
+ARG GO_VERSION=1.23.2
 ARG ALPINE_VERSION=3.20
 ARG XX_VERSION=1.2.1
 
diff --git a/dockerfiles/docs.Dockerfile b/dockerfiles/docs.Dockerfile
index 0ce9f6ca3..8c26489a4 100644
--- a/dockerfiles/docs.Dockerfile
+++ b/dockerfiles/docs.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.5
+ARG GO_VERSION=1.23.2
 ARG ALPINE_VERSION=3.20
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
diff --git a/dockerfiles/git.Dockerfile b/dockerfiles/git.Dockerfile
index c86093ce2..2bc7a4de0 100644
--- a/dockerfiles/git.Dockerfile
+++ b/dockerfiles/git.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.5
+ARG GO_VERSION=1.23.2
 ARG ALPINE_VERSION=3.20
 
 FROM alpine:${ALPINE_VERSION} AS base
diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile
index 8563ade08..f93fc7c42 100644
--- a/dockerfiles/lint.Dockerfile
+++ b/dockerfiles/lint.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.5
+ARG GO_VERSION=1.23.2
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.60.3
 ARG BUILDTAGS=""
diff --git a/dockerfiles/vendor.Dockerfile b/dockerfiles/vendor.Dockerfile
index 1f35e8f5d..d7710ae7e 100644
--- a/dockerfiles/vendor.Dockerfile
+++ b/dockerfiles/vendor.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.22.5
+ARG GO_VERSION=1.23.2
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0