Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: runtime/bin/secure_socket_patch.dart

Issue 1665433002: Adds SecurityContext.setTrustedCertificatesBytes (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/secure_socket.cc ('k') | runtime/bin/secure_socket_unsupported.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/secure_socket_patch.dart
diff --git a/runtime/bin/secure_socket_patch.dart b/runtime/bin/secure_socket_patch.dart
index 8ba011730efb74756fb18cb97bb820b9f709b64c..b15d61a84532551e6bd2abff895d749cf975c6a6 100644
--- a/runtime/bin/secure_socket_patch.dart
+++ b/runtime/bin/secure_socket_patch.dart
@@ -137,24 +137,49 @@ class _SecurityContext
static final SecurityContext defaultContext =
new _SecurityContext().._trustBuiltinRoots();
- Future usePrivateKey(String keyFile, {String password}) {
- return (new File(keyFile)).readAsBytes().then((bytes) {
- usePrivateKeyBytes(bytes, password: password);
- });
+ void usePrivateKey(String keyFile, {String password}) {
+ usePrivateKeySync(keyFile, password: password);
+ }
+ void usePrivateKeySync(String keyFile, {String password}) {
+ List<int> bytes = (new File(keyFile)).readAsBytesSync();
+ usePrivateKeyBytes(bytes, password: password);
}
void usePrivateKeyBytes(List<int> keyBytes, {String password})
native "SecurityContext_UsePrivateKeyBytes";
- void setTrustedCertificates({String file, String directory})
- native "SecurityContext_SetTrustedCertificates";
- Future useCertificateChain(String chainFile) {
- return (new File(chainFile)).readAsBytes().then((bytes) {
- useCertificateChainBytes(bytes);
- });
+
+ void setTrustedCertificates(String file) {
+ setTrustedCertificatesSync(file);
+ }
+ void setTrustedCertificatesSync(String file) {
+ List<int> bytes = (new File(file)).readAsBytesSync();
+ setTrustedCertificatesBytes(bytes);
+ }
+ void setTrustedCertificatesBytes(List<int> certBytes)
+ native "SecurityContext_SetTrustedCertificatesBytes";
+
+ void useCertificateChain({String file, String directory}) {
+ if (directory != null) {
+ throw new UnsupportedError(
+ "The directory argument to useCertificateChain is not supported.");
+ }
+ useCertificateChainSync(file);
+ }
+ void useCertificateChainSync(String chainFile) {
+ List<int> bytes = (new File(chainFile)).readAsBytesSync();
+ useCertificateChainBytes(bytes);
}
void useCertificateChainBytes(List<int> chainBytes)
native "SecurityContext_UseCertificateChainBytes";
- void setClientAuthorities(String file)
- native "SecurityContext_SetClientAuthorities";
+
+ void setClientAuthorities(String file) {
+ setClientAuthoritiesSync(file);
+ }
+ void setClientAuthoritiesSync(String file) {
+ List<int> bytes = (new File(file)).readAsBytesSync();
+ setClientAuthoritiesBytes(bytes);
+ }
+ void setClientAuthoritiesBytes(List<int> authCertBytes)
+ native "SecurityContext_SetClientAuthoritiesBytes";
void setAlpnProtocols(List<String> protocols, bool isServer) {
Uint8List encodedProtocols =
SecurityContext._protocolsToLengthEncoding(protocols);
« no previous file with comments | « runtime/bin/secure_socket.cc ('k') | runtime/bin/secure_socket_unsupported.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698