Title: [98127] branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp
- Revision
- 98127
- Author
- k...@chromium.org
- Date
- 2011-10-21 12:53:06 -0700 (Fri, 21 Oct 2011)
Log Message
Hand merge of patch for bug 70617 from Gaurav Shah
Modified Paths
Diff
Modified: branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp (98126 => 98127)
--- branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp 2011-10-21 19:51:54 UTC (rev 98126)
+++ branches/chromium/912/Source/WebCore/html/HTMLKeygenElement.cpp 2011-10-21 19:53:06 UTC (rev 98127)
@@ -106,7 +106,7 @@
{
// Only RSA is supported at this time.
const AtomicString& keyType = fastGetAttribute(keytypeAttr);
- if (!keyType.isNull() || !equalIgnoringCase(keyType, "rsa"))
+ if (!keyType.isNull() && !equalIgnoringCase(keyType, "rsa"))
return false;
String value = signedPublicKeyAndChallengeString(shadowSelect()->selectedIndex(), fastGetAttribute(challengeAttr), document()->baseURL());
if (value.isNull())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
