From d097841fbe1888ab16c7ee5aec1b87a43b3f14d0 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Fri, 24 Jan 2025 17:53:09 -0800 Subject: [PATCH] Fix certs a bit --- .../integration_test/certificate_test.dart | 14 +++++++------- pkgs/ok_http/example/pubspec.yaml | 1 - pkgs/ok_http/example/test_certs/client-cert.p12 | Bin 2739 -> 0 bytes .../server_chain.p12 | Bin .../{certificates => test_certs}/server_key.p12 | Bin .../test-combined.p12 | Bin 6 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 pkgs/ok_http/example/test_certs/client-cert.p12 rename pkgs/ok_http/example/{certificates => test_certs}/server_chain.p12 (100%) rename pkgs/ok_http/example/{certificates => test_certs}/server_key.p12 (100%) rename pkgs/ok_http/example/{certificates => test_certs}/test-combined.p12 (100%) diff --git a/pkgs/ok_http/example/integration_test/certificate_test.dart b/pkgs/ok_http/example/integration_test/certificate_test.dart index a587377a94..7c6c6b2464 100644 --- a/pkgs/ok_http/example/integration_test/certificate_test.dart +++ b/pkgs/ok_http/example/integration_test/certificate_test.dart @@ -19,10 +19,10 @@ void main() async { test('unknown server cert', () async { final serverContext = io.SecurityContext() ..useCertificateChainBytes( - await loadCertificateBytes('certificates/server_chain.p12'), + await loadCertificateBytes('test_certs/server_chain.p12'), password: 'dartdart') ..usePrivateKeyBytes( - await loadCertificateBytes('certificates/server_key.p12'), + await loadCertificateBytes('test_certs/server_key.p12'), password: 'dartdart'); final server = await io.SecureServerSocket.bind('localhost', 0, serverContext); @@ -51,10 +51,10 @@ void main() async { test('ignore unknown server cert', () async { final serverContext = io.SecurityContext() ..useCertificateChainBytes( - await loadCertificateBytes('certificates/server_chain.p12'), + await loadCertificateBytes('test_certs/server_chain.p12'), password: 'dartdart') ..usePrivateKeyBytes( - await loadCertificateBytes('certificates/server_key.p12'), + await loadCertificateBytes('test_certs/server_key.p12'), password: 'dartdart'); final server = await io.SecureServerSocket.bind('localhost', 0, serverContext); @@ -76,13 +76,13 @@ void main() async { test('client cert', () async { final certBytes = - await loadCertificateBytes('certificates/test-combined.p12'); + await loadCertificateBytes('test_certs/test-combined.p12'); final serverContext = io.SecurityContext() ..useCertificateChainBytes( - await loadCertificateBytes('certificates/server_chain.p12'), + await loadCertificateBytes('test_certs/server_chain.p12'), password: 'dartdart') ..usePrivateKeyBytes( - await loadCertificateBytes('certificates/server_key.p12'), + await loadCertificateBytes('test_certs/server_key.p12'), password: 'dartdart') ..setTrustedCertificatesBytes(certBytes, password: '1234'); diff --git a/pkgs/ok_http/example/pubspec.yaml b/pkgs/ok_http/example/pubspec.yaml index eb548919c6..1b887d6320 100644 --- a/pkgs/ok_http/example/pubspec.yaml +++ b/pkgs/ok_http/example/pubspec.yaml @@ -34,5 +34,4 @@ dev_dependencies: flutter: uses-material-design: true assets: - - certificates/ - test_certs/ diff --git a/pkgs/ok_http/example/test_certs/client-cert.p12 b/pkgs/ok_http/example/test_certs/client-cert.p12 deleted file mode 100644 index 4410032421102f6c74f71058df2ee0acd79588b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2739 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 diff --git a/pkgs/ok_http/example/certificates/server_chain.p12 b/pkgs/ok_http/example/test_certs/server_chain.p12 similarity index 100% rename from pkgs/ok_http/example/certificates/server_chain.p12 rename to pkgs/ok_http/example/test_certs/server_chain.p12 diff --git a/pkgs/ok_http/example/certificates/server_key.p12 b/pkgs/ok_http/example/test_certs/server_key.p12 similarity index 100% rename from pkgs/ok_http/example/certificates/server_key.p12 rename to pkgs/ok_http/example/test_certs/server_key.p12 diff --git a/pkgs/ok_http/example/certificates/test-combined.p12 b/pkgs/ok_http/example/test_certs/test-combined.p12 similarity index 100% rename from pkgs/ok_http/example/certificates/test-combined.p12 rename to pkgs/ok_http/example/test_certs/test-combined.p12