chore(ci): Remove keytool step

.github/scripts/init-temp-keys.cmd

@@ -20,5 +20,4 @@ set "hostKeyDir=%cd%"
 set hostKeyDir=%hostKeyDir%/keys
 set "hostKeyDir=%hostKeyDir:\=/%"
 
-openssl pkcs12 -export -in keys/keycloak-ca.pem -inkey keys/keycloak-ca-private.pem -out keys/ca.p12 -nodes -passout pass:password
-docker run -v %hostKeyDir%:/keys --entrypoint keytool cgr.dev/chainguard/keycloak@sha256:37895558d2e0e93ffff75da5900f9ae7e79ec6d1c390b18b2ecea6cee45ec26f -importkeystore -srckeystore /keys/ca.p12 -srcstoretype PKCS12 -destkeystore /keys/ca.jks -deststoretype JKS -srcstorepass "password" -deststorepass "password" -noprompt
+openssl pkcs12 -export -in keys/keycloak-ca.pem -inkey keys/keycloak-ca-private.pem -out keys/ca.p12 -keypbe NONE -certpbe NONE -passout pass:

.github/scripts/init-temp-keys.sh

@@ -47,24 +47,11 @@ openssl req -x509 -nodes -newkey ec:ecparams.tmp -subj "/CN=kas" -keyout "$opt_o
 
 mkdir -p keys
 openssl req -x509 -nodes -newkey RSA:2048 -subj "/CN=ca" -keyout keys/keycloak-ca-private.pem -out keys/keycloak-ca.pem -days 365
-printf "subjectAltName=DNS:localhost,IP:127.0.0.1" > keys/sanX509.conf
-printf "[req]\ndistinguished_name=req_distinguished_name\n[req_distinguished_name]\n[alt_names]\nDNS.1=localhost\nIP.1=127.0.0.1" > keys/req.conf
+printf "subjectAltName=DNS:localhost,IP:127.0.0.1" >keys/sanX509.conf
+printf "[req]\ndistinguished_name=req_distinguished_name\n[req_distinguished_name]\n[alt_names]\nDNS.1=localhost\nIP.1=127.0.0.1" >keys/req.conf
 openssl req -new -nodes -newkey rsa:2048 -keyout keys/localhost.key -out keys/localhost.req -batch -subj "/CN=localhost" -config keys/req.conf
-openssl x509 -req -in keys/localhost.req -CA keys/keycloak-ca.pem  -CAkey keys/keycloak-ca-private.pem -CAcreateserial -out keys/localhost.crt -days 3650 -sha256 -extfile keys/sanX509.conf
+openssl x509 -req -in keys/localhost.req -CA keys/keycloak-ca.pem -CAkey keys/keycloak-ca-private.pem -CAcreateserial -out keys/localhost.crt -days 3650 -sha256 -extfile keys/sanX509.conf
 openssl req -new -nodes -newkey rsa:2048 -keyout keys/sampleuser.key -out keys/sampleuser.req -batch -subj "/CN=sampleuser"
-openssl x509 -req -in keys/sampleuser.req -CA keys/keycloak-ca.pem  -CAkey keys/keycloak-ca-private.pem -CAcreateserial -out keys/sampleuser.crt -days 3650
+openssl x509 -req -in keys/sampleuser.req -CA keys/keycloak-ca.pem -CAkey keys/keycloak-ca-private.pem -CAcreateserial -out keys/sampleuser.crt -days 3650
 
-openssl pkcs12 -export -in keys/keycloak-ca.pem -inkey keys/keycloak-ca-private.pem -out keys/ca.p12 -nodes -passout pass:password
-docker run \
-    -v $(pwd)/keys:/keys \
-    --entrypoint keytool \
-    --user $(id -u):$(id -g) \
-    cgr.dev/chainguard/keycloak@sha256:37895558d2e0e93ffff75da5900f9ae7e79ec6d1c390b18b2ecea6cee45ec26f \
-    -importkeystore \
-    -srckeystore /keys/ca.p12 \
-    -srcstoretype PKCS12 \
-    -destkeystore /keys/ca.jks \
-    -deststoretype JKS \
-    -srcstorepass "password" \
-    -deststorepass "password" \
-    -noprompt
+openssl pkcs12 -export -in keys/keycloak-ca.pem -inkey keys/keycloak-ca-private.pem -out keys/ca.p12 -keypbe NONE -certpbe NONE -passout pass:

docker-compose.yaml

@@ -6,16 +6,15 @@ services:
     volumes:
     - ./keys/localhost.crt:/etc/x509/tls/localhost.crt
     - ./keys/localhost.key:/etc/x509/tls/localhost.key
-    - ./keys/ca.jks:/truststore/truststore.jks
+    - ./keys/ca.p12:/truststore/truststore.p12
     # This is kc 24.0.1 with opentdf protocol mapper on board
     image: cgr.dev/chainguard/keycloak@sha256:37895558d2e0e93ffff75da5900f9ae7e79ec6d1c390b18b2ecea6cee45ec26f
     restart: always
     command:
     - "start-dev"
     - "--verbose"
-    - "-Djavax.net.ssl.trustStorePassword=password"
     - "-Djavax.net.ssl.HostnameVerifier=AllowAll"
-    - "-Djavax.net.ssl.trustStore=/truststore/truststore.jks"
+    - "--truststore-paths=/truststore/truststore.p12"
     - "--spi-truststore-file-hostname-verification-policy=ANY"
     environment:
       KC_PROXY: edge
@@ -38,7 +37,6 @@ services:
       KC_FEATURES: "preview,token-exchange"
       KC_HEALTH_ENABLED: "true"
       KC_HTTPS_KEY_STORE_PASSWORD: "password"
-      KC_HTTPS_KEY_STORE_FILE: "/truststore/truststore.jks"
       KC_HTTPS_CERTIFICATE_FILE: "/etc/x509/tls/localhost.crt"
       KC_HTTPS_CERTIFICATE_KEY_FILE: "/etc/x509/tls/localhost.key"
       KC_HTTPS_CLIENT_AUTH: "request"

sdk/internal/oauth/oauth_test.go

@@ -544,19 +544,19 @@ func setupKeycloak(ctx context.Context, t *testing.T) (tc.Container, string, str
 		Cmd: []string{"start-dev", "--http-port=8082", "--https-port=8083", "--features=preview", "--verbose",
 			"-Djavax.net.ssl.trustStorePassword=password", "-Djavax.net.ssl.HostnameVerifier=AllowAll",
 			"-Djavax.net.debug=ssl",
-			"-Djavax.net.ssl.trustStore=/truststore/truststore.jks",
+			"-Djavax.net.ssl.trustStore=/truststore/truststore.p12",
 			"--spi-truststore-file-hostname-verification-policy=ANY",
 		},
 		Files: []tc.ContainerFile{
-			{HostFilePath: "testdata/ca.jks", ContainerFilePath: "/truststore/truststore.jks", FileMode: int64(0o777)},
+			{HostFilePath: "testdata/ca.p12", ContainerFilePath: "/truststore/truststore.p12", FileMode: int64(0o777)},
 			{HostFilePath: "testdata/localhost.crt", ContainerFilePath: "/etc/x509/tls/localhost.crt", FileMode: int64(0o777)},
 			{HostFilePath: "testdata/localhost.key", ContainerFilePath: "/etc/x509/tls/localhost.key", FileMode: int64(0o777)},
 		},
 		Env: map[string]string{
 			"KEYCLOAK_ADMIN":                "admin",
 			"KEYCLOAK_ADMIN_PASSWORD":       "admin",
 			"KC_HTTPS_KEY_STORE_PASSWORD":   "password",
-			"KC_HTTPS_KEY_STORE_FILE":       "/truststore/truststore.jks",
+			"KC_HTTPS_KEY_STORE_FILE":       "/truststore/truststore.p12",
 			"KC_HTTPS_CERTIFICATE_FILE":     "/etc/x509/tls/localhost.crt",
 			"KC_HTTPS_CERTIFICATE_KEY_FILE": "/etc/x509/tls/localhost.key",
 			"KC_HTTPS_CLIENT_AUTH":          "request",

sdk/internal/oauth/testdata/keycloak-ca.pem

@@ -1,16 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICljCCAX4CCQCbn54dZw//JTANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJj
-YTAeFw0yNDA0MjUwMTUzMjlaFw0yNTA0MjUwMTUzMjlaMA0xCzAJBgNVBAMMAmNh
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArgtrFrIciTIVTJA9IaG/
-Hs3rjdE++BpO5KsTKci09XHjTHQ2ej3q04ycblcDqb5iv5MJalSEy91522WR5SI0
-SEFtVcflOLM8AwreZ7u65ouIyGH3KqOMzAZmdX6Q83FDWZsEDkFeKZsgcIHFMMbT
-of40AgyvMFvH45wT4OkWkVcu/nlNkVN6CDfQQ+eMcIaBaNq+cwq41s6avMn3S8yG
-qbEfj0J8ez8kk1TBRPgUeniL71HeUllqg0tXt6LpcASeBrsK7p9BOX4isBsy4+rl
-2Iu6MFOD4rghM3LPV/07KCTrpKLGHeBGtgW95TOkZHvCvnQqPO0P6lklix/oyBpK
-iQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBbsdaX7ze6w7kr/DTMqTIYc3tVXhmN
-HNmQ+pFAbo23m2IIfC7UYGvDYUI0DIAaHz3PcANua+HnwVPq5toRayhjr1wzp/4w
-ecqli4hKxejAEgW1aqrKpka0YLt6U7jHMMBKOj+H2upgCVKs6cN84QpPVh0bGhXf
-Gxe9ysum7OmjyuFpZc8Q65mbv6N+/R6KXcipECRj2AOtyvaMOtpXI88RTsluQbBS
-M9BZ2fP9Jan2ABTCYUMINndAu710Fl9BcoRaysHWNoT0GjXRQwEmIIbLq6c5HAn2
-zNm+CPaRVCVdgZD0YwLee1z/mHsccLY68tZ72cg44WDIFv3Eqdxwc55e
+MIIC+zCCAeOgAwIBAgIUItDBgeM3E53MhJMndWiDE8dAIB4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwHhcNMjQwODMwMTMxMzEwWhcNMjUwODMwMTMxMzEw
+WjANMQswCQYDVQQDDAJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALXxnbETs5ahEyY2RQd1ZUm1ketY7QJKvzWkwxhMxNWquF7raGDBcq1nOTGgWaHn
+wRCCp10AAEsUhlzQEguLxOfgQccKKsBiBheV2JOAmJjKdMZspLuAyg00iGCrdhhl
+gOzZvgv5Re5EhmG9B8I6PCJVY4rf3qMRWc0AjoLI16EXDr1NNYclT1vWsHAQEska
+CPcITYWT3dgSEittjXhx2qM5vKuuMRkLFghdCg8G5ojt6bCdgE1MSTgnfN2scpaB
+0CVJAVKkC92RMkMiXJpj08XLZWCz++PjHcR2N1XY0IJgSlsuTfvo39S9pXgRQxD2
+KyirynUSse+LpqkZxD6EaX0CAwEAAaNTMFEwHQYDVR0OBBYEFI6+sxYzSS8hV4T7
+IHIlnPJx9G3tMB8GA1UdIwQYMBaAFI6+sxYzSS8hV4T7IHIlnPJx9G3tMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAJxC4PXdMxZbvoXaj0gU7Z8
+ixBkFkV8gzZonJcmj1Z3ZWkbwZ4TrAC5dMkFBg7p6shER7Cj4s94ZS775GcPc12q
+gUAuRu10ozP2ZuT7TzxOrpSaMuKuAy0A1B35mJz3rWFqzrWZrheHAMitajMtA6Ou
++xgYpfLEC+zkGA4tq5l02yWhdkIQmv5MPi25dkcu1hL5XuUD0Vw/r/OAIZoP20qI
+tZIPfrnCb1EnlyBU+aQ5vhtUptmd4krprR1ujkji5PlDpJ+TbgGjNQg/1rCAf+D1
+2e9Ap3Ktmno841yLyifKbp8aHgW4ndnb1KKJ+Nn7iCEt431Ns8yhTaIC5mIE7/o=
 -----END CERTIFICATE-----

sdk/internal/oauth/testdata/keycloak-ca.srl

@@ -0,0 +1 @@
+742AA38E17BAAA9E9D5BB22C8FCF5FB37C77D158

sdk/internal/oauth/testdata/localhost.crt

@@ -1,17 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+X07gSnunIgFHEm9+wKbLHX0=
 -----END CERTIFICATE-----

sdk/internal/oauth/testdata/localhost.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyq77Q7FUuAUQZ
-pIBp/a8+Gdx+CtkfaDIKDBUo/ACM00oCRBjx1hNwR4Id1dzj3OASeDowJ9H0qXTb
-paiwVATSZzCmQgzk37PyQe4ATYNbgeB22t1JnNqzzB8s5OGF+7qiC42KimzLRKA0
-OePALh1DWB7viHnu7pI1ZVe4zRfVvvlaOsvadsqKOgvQpRfvbEmh014XFPGvGhA1
-HrdnE3YIhDBiZtwnd8ABgMxTDfpiXR3nLmdpumXufNjf/mSy8LFhsnycydtRSbJ9
-NNmcPhNbrZXkdMi9ltJI0cORXdGMrFyoUnSkEPZMgQbm47mFYS31gcZF1VeYE5aj
-X7ktfujHAgMBAAECggEBAKcd8y3RT97m+j6N2jrJOMd6Qv11wh4ZRGyXXpdmFlGi
-M2ApN7fDx4zGpdKoPaK37rH32F1AcaZJde8YZM8A1z3BnQR1VUAiaVqYBjgsSEgo
-E763+jEnUHzJ2QMR1kuO58M30R0bWqVJvBr9ZqRTvbVG0DC1028DoKfm8YT9+GRI
-Ws18LiLRoWO67Wrw1hu/uX/xA482qqLBn6JGQVcgGkvtQvBqdBzKRXaOkznZc0Sk
-nHVHOanKGRtAYUQCu7jga2BuayCn4rofbpCT4SUmyHSjA0mSHIgpRdBCyslSKkeO
-az3Qv6K19o3u4HrKQJxsuqW/ka4j0bN11WOBvB+UbxkCgYEA39PsFidZvu4l6Wzs
-GYbAD1N5SgLAtqvwCwCIiF8ZCUBe9ORYoPN+yvlHyQ2SMyqDUYdJ8j+RWey9Geg+
-juSIwkrtl9bNgVRiCPLrddYdod/F71QeCHqlTYkkomLaYODDRkoFS6jNXDRZxaZK
-IXBr3y28PwfPpwT4LGtp71PgQ0sCgYEAzFo00Y83Iz/7jnV8wm97En7JL3y4yXMx
-9kE+zj2kJWBL5HtH6mVOEFy6npSKkeqR25oF4WV2zyLyu022m1YSJxbC+XMe2qZZ
-+dUuhEggGBkTfTMl+eWUedizuDPq7vd5AHeVn9+Oaxl0W/pBnqLAyGDVnyxkZkC+
-uUHD811oRvUCgYEA1qXEFWa9UTXPE7DKJpysGMaDXW+QYl43AEYNqUIRn2ak6ZMG
-T6vTX1F5/xxNpVXSw1/LkU5W1PcMTgkD3ULayADVIzTytWE39r8HAWVJ24/eoOp5
-NsZvOhEYGcZVCGzjt8eKlokWD6OAp+QV2UWXnVqd2ZBjGhfQ68BCwiocuksCgYAn
-+9Jv2lzIeeFni1dg1901zjbhIr8pM2/oJfX69paidYgD6Zc1pqKykuI02w2N5V6q
-oCVcZ7TqbIUf3uHG3P1qRorZsgusbnYWav7SBSa6cFWe3p4kmiYF/T+U4BusrCEx
-1TQiduRv0igxQvMJ7gBYdJH3tgDi/PIUX2jOuk0H7QKBgDxOWfRezUgS0IoXA4fk
-l5wAmPuc3h/PmiluaR4tM/rusXK7sz+LyqeuVv20qEW1+fiSJYEpavr9WHzZYbYh
-AgJE6n5UCWMogSmq4LzqI1dXU45lXytL3aDYwoo+UK8L0FsYi5FSI8pgXLRIpUY/
-JXfGmyC6web7ytelgOEG8vBo
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC9VsbZ2W5QEF7n
+mzcLowLoppPwDPwS5CYR4aTVB/SJYNxMtz0fFwy0GN0fRZYuwV+1TAZyy2EyTn92
+Hs02tdryF16T23pe+RdZD0/Gd/wS7kUvDaSeSQ1cMjZY0eRM3Pc6TQjeul6KnXdP
+imalw0nQUBPDwahXolO8jxOW7IcrLVDPwtAMb2ft89JmAe2qjoEHPaTzo0owzTbL
+7G7+nUeAqBQcI6agzhWEnlofni3Ac0r6Eq29Bu5A4BAeNOKDpfRZ9zJecUepQfBR
+ikBC651pGpIwM/0ElDhjBEraMhdSsebfaaeCGdITMDiO3twXMLmIi1QoHQX33LQu
+RvmPDqwRAgMBAAECggEAHkIjdkY2yGnNWPMnuV7cRKT2aHsSv8whP2NRrc/fJyNJ
+IaN5C6Jp39BHakt7JE64Bme3choJlvoPiaeDgTZP3reYYEXHiS0Cq7N0OtILAVV9
+zfa+s6MWFQFbSReGBjib8//CpqGfIUTn/9is7dnHTpi1h+fHiPXCrxQoe8qiEWae
+QsRK/Ii1TcDlBDjbw9WjpE4QVaAWG7kbIVJT+bV3eEZrYfpOCacfqPZSrPauA9Dy
+5OP0sKbv/1BgTawlVngwkoX565TlKb8xyeM/6ZIS/7lDNuo8KH2Rw8e35g+V34oZ
++JsbjYR3XDFFnDtjNJ5BV15A6v+JblsSCGfmek3s9wKBgQD12QBAsGHqwxol8+k3
+g4AT+lcXHMTP4j5MqV2w2uOCIC7whFa1PNvQp+8xJqgt4ucey5tBfyartIa08aXK
+I1YNk9MqJ4WSDvx995n/7qglu5SMRTZPiVZRWHSX6m0yVwEX+lmTSEuxGVntfM3D
++4e3ygfVr4q2p/G/S7Kh8aP+hwKBgQDFKGO0Qo3j3TQRcJirSHjGx9t6Zx6GJEqs
+oHmRcf4PMy8GbFZC5TtVJqXnt0M9HmgwGKSUISP8otoB0qK/McXMrR9da4/+nx1J
+W+e5xtz6UQOTAjyzg2NLIzZO0A4gUIs9VXK5wrIbuqZOEJBIcXePcogIipMbHhdo
+gvYj3WXOpwKBgDW/k4aRCVdCAF17zekNHts/R/sNlxm75NLt1EXuFP9F+f0rcal9
+/LDJhknAodQmX1EkQnU3T0UK2siEbDKdNxsQzoHQ0ir0i88eatTBYJGfSQLBvvX0
+mKKALD1qSyVOUDblzN+eVq4JVNfPCU1nmGxeBwh4sGLupLOl4Q/2vFvRAoGAeMdp
+bQBok/Lq9tQXcraO5peAqNeLJ3oMFPyp/KPsk7szT6gGoCx10JBAilcGZea+xNgT
+2nsC5L2O+BblhGMlXWGhGUXPjJhFBK+8oV5l+SKwIdr4/K+8oEcN+fIS9VDiO8yg
+35OaMMqDHsee3AJG0CXFmBXsUGx6wpeX2hjDSXkCgYAkCpCF1jzlKXwicTgMh257
+uP32rtXzSoX6iny2IR3O/CNBbLBG3x3iax6zPvAektiZIb7i5cg4CoQtsIncVKzM
+JjFlv1s9EsQtXGzGtu27OTGp0fiA6ae9vBW0IbM1Xfq7McyJ8TKKvYO4jNhgUVdK
+a0D248NUa4CgOFkyVHdxXw==
 -----END PRIVATE KEY-----

sdk/internal/oauth/testdata/sampleuser.crt

@@ -1,17 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICnjCCAYYCCQCrVVwgHq/ISTANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJj
-YTAeFw0yNDA0MjUwMTUzMzBaFw0zNDA0MjMwMTUzMzBaMBUxEzARBgNVBAMMCnNh
-bXBsZXVzZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaXs9WCGdF
-wtRcs8+NGyf8lebUQ55fBTKUn7Y6tIfox/f6Mtrtc9xUW+1fiO7PhiVxRphAPdft
-tekLGB6LKYRmnBk58EBUQpbbC2mfxL8LhdEYz9XCq8pzGLI59IciRqHaS1YMH9pH
-W7e5PDCuS5BrcA05gip5y6vyiLh80GWKwo/9Wf8A70KtLnk3ggrFKMXw5DOCVzTM
-6ms6bVjqdXHK1c64q/kNcr4nrEiamV8KwH87UZ8qCMWkET5B4/+lTbgioEdPZ65F
-QVwMMUkCcFl+smwmiIZtjiTsnfsq8Tc/KcLz4VKRNB2E0mlOG3DHueNHyVRuNoxf
-ZYny50R+2m+DAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADvMJOsi11bBZSAj6ShB
-MHklzJLjdHrwjI3+V7qb/9Lacn6ekrrHEan6XM+FXv/hg+DQ7ArUG+sfG5HF5qvT
-zzI3qEWw6N2xJY4MXfdPixUVs4w4cwolgOoEVnGRx0lz4wDCuBA+Eev6SvZq685U
-nS/OZTckfRKEe783NFxMuo+By1POLlbO6BCu5z6QmWfbqK4Q8vx0PTpq/O8ZpJ1P
-qQaIJ5UIoPmcKjFjn3aNlJBQUHV89bvJbeXoplMHh8BcjYz+2tX4wZW/MjaB3RvX
-y3GoiW/YyHdx4//zJtrOknRizIRvr+GXZ3vBSom1Sz4XJyEmJ43YReSmMgMHLzwr
-pIY=
+MIIC8jCCAdqgAwIBAgIUdCqjjhe6qp6dW7Isj89fs3x30VgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwHhcNMjQwODMwMTMxMzEwWhcNMzQwODI4MTMxMzEw
+WjAVMRMwEQYDVQQDDApzYW1wbGV1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAt4U3qlTqFGqcZX7cxo6P0oD5sh2S1+OHCgbTtXulNbjR7Ile/k3M
+xiNF075y/HevmkYLF6dTyC0xYsG5xw0ihMgmIKxzaXswyU0TJmrLzl86dQxBa4Re
+9S9FbdnsneFwCXNk78mqxhkaegbAjmPlIOF1/DRBYYG3oKmFt2+DNch05X5XAofK
+truUwRGqiWHAQ+CaHLlSqnbXyym0FkAcQmDy+2zFuSTYGtKk5CygrhVQTbQQg6si
+IVImGnoIcRAZCk8Rujzt8VdMFIKOeVdAGD540pH6EK6r7UFpLHD8hN27BL9JlICS
+/sI/QnHLaJ/qLCxAgAXJLN24tVhOL99jNwIDAQABo0IwQDAdBgNVHQ4EFgQUVsmE
+Zm2hXCNXDgT3Bglgbxn9e2UwHwYDVR0jBBgwFoAUjr6zFjNJLyFXhPsgciWc8nH0
+be0wDQYJKoZIhvcNAQELBQADggEBAFw9uTt8mHS2KsWOQZYuifU1H1JdkebzvWAs
+ZTuucaK0g/HTjm1iCuI/K4/uS+ks3QAliwar3BcjCB/cQgKr2OXNjyhhXlkcQOpL
+WKytm+Clw1t7tZWAe2MaLOcIkS+rIEfJeXEGv/uzNk/JEbYFn3T4RosELitwPe0B
+8qEt20Cag28r/zZ6Fw1OAAhuxlmNd6wPkpcx7PtYeH2qzz2SyY8bj9o3+nNy+1vA
+tvL8n0nVfMPmi54ZamaJOViMbZnjTOaMloFH3PSCLbdOejghIq+g6/lV6TgmPerJ
+duxd1n7wd/D4I+nC+E0SN/rVaJwYU2QFzMVtsi11p6xgnQSaXd8=
 -----END CERTIFICATE-----

sdk/internal/oauth/testdata/sampleuser.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCaXs9WCGdFwtRc
-s8+NGyf8lebUQ55fBTKUn7Y6tIfox/f6Mtrtc9xUW+1fiO7PhiVxRphAPdfttekL
-GB6LKYRmnBk58EBUQpbbC2mfxL8LhdEYz9XCq8pzGLI59IciRqHaS1YMH9pHW7e5
-PDCuS5BrcA05gip5y6vyiLh80GWKwo/9Wf8A70KtLnk3ggrFKMXw5DOCVzTM6ms6
-bVjqdXHK1c64q/kNcr4nrEiamV8KwH87UZ8qCMWkET5B4/+lTbgioEdPZ65FQVwM
-MUkCcFl+smwmiIZtjiTsnfsq8Tc/KcLz4VKRNB2E0mlOG3DHueNHyVRuNoxfZYny
-50R+2m+DAgMBAAECggEAbhP/i1zQr6k/n59E+F0OBYqrIF/bdeyR5fOBkZkcdTzr
-MonDHaIJ0kn/GaneiTMiTgVGGkE/Ua3vMU8QsLF5TWYwguU0KiGVyzr3Jcu5Y7EX
-qrbBumCgK7THmpYpKqLtVWl1QY4RK+NWPouSNyeBI2uysniEa3d19KvTyoUcc3Yw
-be5aK+b3MXC5Ig7tuXXroM7ubBG4/MqHi9t7IPyTbgJw6iiqLPS9Lckjb6mSQVxr
-zcwfc48MFgdkv/ZAKtSTYCrz8miUuTPvn7DfHdRlyN27AvDgw0VjNgD2JbQOkJNf
-E08auB8oJHN65wo3i1Ko8iNp2JjySTU9udq2opwluQKBgQDMvWbuxq5nhQzdVcpo
-zFVdAWhaWpjHzcSl2oy/r5fyIx5FlOk0spv/AOXNe0i76OYfsxKSdp8ewK9U8Y7g
-LPg8Wf1Yh/xThgytcmltpylbWq9YliGIjakDQgXvGY/MzOi5jQoWkVtBU9KL74Fn
-Cmv2V8I2/RcGnrQPFUtk5+pzhQKBgQDBBQZLu56MzyjD8s7gchODGuNH/uIZBGi0
-NcYaFa1coEXshFguXwp38kzuE+YhXbCw0s6IF8gz8F+coyXXnDMGt2J5K97mUfjo
-Z+VeFV18uomEMpJNQ/AHqn6QIEpTKsisEKfROO7rFSKkZAkAUIGTUHhgcT6qRfDk
-jmgWfjuxZwKBgQCpvcVe5P2m+Znmzr+XDwEesJIRhtbvn9sPHhheu3ef2hm42nJV
-rFbEnbvoFfQBRl+znEUjhJD7cAhsxjAMD3xmnLz77xH1NUfBbP+XV2VkRdTl/uIi
-Uj/zYYOF7Y1Y3/F6FEJu32fmy1Xdil2gTfWgMLXl3QKADId/kcoGCHhJ+QKBgQCT
-7PfgPo/KNlF1qrYliQevKIIbARniNmDQC44hG4/bNvGfy+WQ1EG/nzCaHSH3XEg3
-m7ew0RkbxRJhhx9PWGQ6t3x+hMK1HQl3g3hjXFhjaMpPSDqbgH+KQH3ykuyjRFy6
-kaErVUi1XWNJPWkwloJXlgpLTz7JXAS8BO98nY297QKBgHn5oyUJW9HEkBh7SP5k
-CwMNGVynJ8+2phN8AcAhMH/RzFokQ4qlL2i3nHk7hg8ETcg5y56INPWsw3Xcx2bp
-T2UouC9i3fhGlY4nZEunYntScUPCza4ynzBashEzVzCnOVFYBK9rjvGOP0bKftYK
-czNbHJn06rJdbocE/JfW5m+u
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3hTeqVOoUapxl
+ftzGjo/SgPmyHZLX44cKBtO1e6U1uNHsiV7+TczGI0XTvnL8d6+aRgsXp1PILTFi
+wbnHDSKEyCYgrHNpezDJTRMmasvOXzp1DEFrhF71L0Vt2eyd4XAJc2TvyarGGRp6
+BsCOY+Ug4XX8NEFhgbegqYW3b4M1yHTlflcCh8q2u5TBEaqJYcBD4JocuVKqdtfL
+KbQWQBxCYPL7bMW5JNga0qTkLKCuFVBNtBCDqyIhUiYaeghxEBkKTxG6PO3xV0wU
+go55V0AYPnjSkfoQrqvtQWkscPyE3bsEv0mUgJL+wj9Cccton+osLECABcks3bi1
+WE4v32M3AgMBAAECggEACvBvbYFLRLVIJkqmGVXVH9ydRa86mhDPc1sN0pMQuX+P
+T9Sua2Uy0Bq5JlKDYyY1OvJy5dGNDnEXMQZQLxvK03RkxWzSIlb8BPvJqPATvvTx
+NJnq6mBFEsNjFZW4Y37VIVMWEK8KNW24pM5zOumcdlXKJSLuRMQpMHP6awFEJnf2
+0r5ZpgqGO5kb0ADSTNWvjdW9f+KZdYxtjxLrGq+KzDwNFgi/QQuDSubc16Zd/Ubw
+UFpIe0DvxMbxu8P/g3S8rF9FKaS/q229MzqLa4PlH16f23KLjIoBqqX2CxN0vM1b
+WQxmrqFN2du5AiwXtDrXgyttMxsYKommyCIi/DJtLQKBgQD7rMTd0ZVIQ/dBpDV3
+UIT+090M4EwZaM0wu447GAfBSgo03tWonxzeQy69MwqDhf7Yd1gR7MmnVGyShVIC
+3GWtB2RAOb+zJ6kaCB7VO9/YRjgJDrJfJWGjrl16yO8huCJjcneBK6l2dtgTtO7U
+LRhQGcxv4mbQF48RNcYcDgeNgwKBgQC6rJssCNz/R0OgROQs0pFvINUI864LeQti
+3//8m1sWmi31+NIjkfg558A7RuR42+EFXfA0njFk7nfG+oTUTcbSTKTtKXf/1JCR
+ElY/P6yCkqPDejB4vSFPG7EAHNTMIu7GU4zWmFoLlI66rl6BYp3NHsvrDkA6mzvC
+nB2S/8W5PQKBgHnOoa2WLUE/m+EKP9JShzvqgHcl6870eTMX43vYYpB7bDswiopF
+ECzGqU1q8bC8Xp6YDGkIiITTCIVVv16hGxjGlg+7o3trO53cxkd/5hP/0EkZ8ty3
+8+zLjHTL4WkZfJNTKGG9JxSt6mCHVnwco0LJabfRBN+8N0MmGo8jfyZPAoGBALQD
+xXO2bF9keqtwI9WxjXvr3mROkTURGlDUEEiqDDIEpnO/6e1RU12Lxg2jtKlz6FBD
+oWMsdheN+0WPyk3tXuDn9leaGNVFR9AOLcu6fIJCJNhZ2aplQFzIKG0iYHcm7Lmm
+UneS3aqzLNyLUClXTzNCEoVu7bNWhU+LOt3J9wNFAoGBAJf2JEVBsWvsXFF7Z4RM
+WQPsLl6ilZbP9mppts3ZpE555brtR6sJopEstWg95wBPTKRH1mDZra9vGVpr11L4
+eOwyF2HMOkfo0Gtd/GIwHLBE6/8qieLNs46YWXyp4rBAkMuU92FpkAHHNRMLDoHA
+DYcvh9RYsJlBxx4lyH6kuyea
 -----END PRIVATE KEY-----