Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 0 insertions, 98 deletions

diff --git a/Source/WebCore/platform/wince/KeygenWinCE.cpp b/Source/WebCore/platform/wince/KeygenWinCE.cpp
deleted file mode 100644
index 8537f44..0000000
--- a/Source/WebCore/platform/wince/KeygenWinCE.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Torch Mobile Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "SSLKeyGenerator.h"
-
-#include "Base64.h"
-#include <wtf/text/CString.h>
-
-#include <windows.h>
-#include <wincrypt.h>
-
-namespace WebCore {
-
-void WebCore::getSupportedKeySizes(Vector<String>& v)
-{
-    v.append("High Grade");
-    v.append("Medium Grade");
-}
-
-String WebCore::signedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL& url)
-{
-    String keyString;
-
-    HCRYPTPROV hContext = 0;
-    HCRYPTKEY hKey = 0;
-    PCERT_PUBLIC_KEY_INFO pPubInfo = 0;
-
-    // Try to delete it if it exists already
-    CryptAcquireContext(&hContext, _T("keygen_container"), MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_DELETEKEYSET);
-
-    do {
-        if (!CryptAcquireContext(&hContext, _T("keygen_container"), MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_NEWKEYSET))
-            break;
-
-        DWORD dwPubInfoLength = 0;
-        if (!CryptGenKey(hContext, AT_KEYEXCHANGE, 0, &hKey) || !CryptExportPublicKeyInfo(hContext, AT_KEYEXCHANGE, X509_ASN_ENCODING, 0, &dwPubInfoLength))
-            break;
-
-        // Use malloc instead of new, because malloc guarantees to return a pointer aligned for all data types.
-        pPubInfo = reinterpret_cast<PCERT_PUBLIC_KEY_INFO>(fastMalloc(dwPubInfoLength));
-
-        if (!CryptExportPublicKeyInfo(hContext, AT_KEYEXCHANGE, X509_ASN_ENCODING, pPubInfo, &dwPubInfoLength))
-            break;
-
-        CERT_KEYGEN_REQUEST_INFO requestInfo = { 0 };
-        requestInfo.dwVersion = CERT_KEYGEN_REQUEST_V1;
-        requestInfo.pwszChallengeString = L"";
-        requestInfo.SubjectPublicKeyInfo = *pPubInfo;
-
-        String localChallenge = challenge;
-
-        // Windows API won't write to our buffer, although it's not declared with const.
-        requestInfo.pwszChallengeString = const_cast<wchar_t*>(localChallenge.charactersWithNullTermination());
-
-        CRYPT_ALGORITHM_IDENTIFIER signAlgo = { 0 };
-        signAlgo.pszObjId = szOID_RSA_SHA1RSA;
-
-        DWORD dwEncodedLength;
-        if (!CryptSignAndEncodeCertificate(hContext, AT_KEYEXCHANGE, X509_ASN_ENCODING, X509_KEYGEN_REQUEST_TO_BE_SIGNED, &requestInfo, &signAlgo, 0, 0, &dwEncodedLength))
-            break;
-
-        Vector<char> binary(dwEncodedLength);
-        if (!CryptSignAndEncodeCertificate(hContext, AT_KEYEXCHANGE, X509_ASN_ENCODING, X509_KEYGEN_REQUEST_TO_BE_SIGNED, &requestInfo, &signAlgo, 0, reinterpret_cast<LPBYTE>(binary.data()), &dwEncodedLength))
-            break;
-
-        keyString = base64Encode(binary);
-    } while(0);
-
-    if (pPubInfo)
-        fastFree(pPubInfo);
-       
-    if (hKey)
-        CryptDestroyKey(hKey);
-
-    if (hContext)
-        CryptReleaseContext(hContext, 0);
-
-    return keyString;
-}
-
-} // namespace WebCore