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

Unified Diff: ios/web/web_state/wk_web_view_security_util.h

Issue 1322193003: WKWebView(iOS9): correctly update SSL status for current navigation item (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@reland_cert_verification
Patch Set: Merged with origin/master Created 5 years, 2 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
Index: ios/web/web_state/wk_web_view_security_util.h
diff --git a/ios/web/web_state/wk_web_view_security_util.h b/ios/web/web_state/wk_web_view_security_util.h
index 7dcce6af9ca349dd72d834a0cdb6d1c2b7cb3f2f..15c3fe9e77160b1e3466046011a7fe0ee8649a13 100644
--- a/ios/web/web_state/wk_web_view_security_util.h
+++ b/ios/web/web_state/wk_web_view_security_util.h
@@ -6,8 +6,11 @@
#define IOS_WEB_WEB_STATE_WK_WEB_VIEW_SECURITY_UTIL_H_
#import <Foundation/Foundation.h>
+#include <Security/Security.h>
+#include "base/mac/scoped_cftyperef.h"
#include "base/memory/ref_counted.h"
+#include "ios/web/public/security_style.h"
namespace net {
class SSLInfo;
@@ -27,6 +30,11 @@ scoped_refptr<net::X509Certificate> CreateCertFromChain(NSArray* certs);
// Returns null if trust is null or does not have any certs.
scoped_refptr<net::X509Certificate> CreateCertFromTrust(SecTrustRef trust);
+// Creates server trust object from an array of SecCertificateRef objects.
+// Returns null if |certs| is null or empty.
+base::ScopedCFTypeRef<SecTrustRef> CreateServerTrustFromChain(NSArray* certs,
+ NSString* host);
+
// Makes SecTrustEvaluate call to return kSecTrustResultProceed.
// Should be called only if the user expilitely agreed to proceed with |trust|
// or trust represents a valid certificate chain.
@@ -41,6 +49,9 @@ BOOL IsWKWebViewSSLCertError(NSError* error);
void GetSSLInfoFromWKWebViewSSLCertError(NSError* error,
net::SSLInfo* ssl_info);
+// Maps SecTrustResultType value to web::SecurityStyle.
+SecurityStyle GetSecurityStyleFromTrustResult(SecTrustResultType result);
+
} // namespace web
#endif // IOS_WEB_WEB_STATE_WK_WEB_VIEW_SECURITY_UTIL_H_

Powered by Google App Engine
This is Rietveld 408576698