Modified: trunk/Source/WebCore/ChangeLog (214824 => 214825)
--- trunk/Source/WebCore/ChangeLog 2017-04-03 18:38:37 UTC (rev 214824)
+++ trunk/Source/WebCore/ChangeLog 2017-04-03 18:40:54 UTC (rev 214825)
@@ -1,5 +1,50 @@
2017-04-03 Zan Dobersek <zdober...@igalia.com>
+ [GCrypt] Implement CryptoKeyEC::keySizeInBits(), ::platformGeneratePair()
+ https://bugs.webkit.org/show_bug.cgi?id=170345
+
+ Reviewed by Michael Catanzaro.
+
+ Start implementing the libgcrypt-based platform bits of CryptoKeyEC.
+
+ Implement keySizeInBits() by returning the appropriate size for this
+ object's curve type. An assertion is added to ensure that this size
+ matches the one that's returned by gcry_pk_get_nbits() for this
+ object's EC key as represented by the m_platformKey gcry_sexp_t object.
+
+ Implement platformGeneratePair() by constructing a genkey s-_expression_
+ that requests a generation of an EC key for the specified curve type.
+ The s-_expression_ is then passed to gcry_pk_genkey(), and the public
+ and private key data is then retrieved from the returned s-_expression_
+ upon success and used to create the public and private CryptoKeyEC
+ objects.
+
+ The PlatformECKey type alias is changed to match gcry_sexp_t. The
+ CryptoKeyEC destructor releases the gcry_sexp_t object through
+ a PAL::GCrypt::HandleDeleter<gcry_sexp_t> instance.
+
+ The method definitions in the CryptoKeyECGCrypt.cpp file are also
+ sorted to match the declaration order in the header.
+
+ No new tests -- current ones cover this sufficiently, but are not yet
+ enabled due to other missing platform-specific SUBTLE_CRYPTO
+ implementations.
+
+ * crypto/gcrypt/CryptoKeyECGCrypt.cpp:
+ (WebCore::curveSize):
+ (WebCore::curveName):
+ (WebCore::CryptoKeyEC::~CryptoKeyEC):
+ (WebCore::CryptoKeyEC::keySizeInBits):
+ (WebCore::CryptoKeyEC::platformGeneratePair):
+ (WebCore::CryptoKeyEC::platformImportSpki):
+ (WebCore::CryptoKeyEC::platformImportPkcs8):
+ (WebCore::CryptoKeyEC::platformExportRaw):
+ (WebCore::CryptoKeyEC::platformAddFieldElements):
+ (WebCore::CryptoKeyEC::platformExportSpki):
+ * crypto/keys/CryptoKeyEC.h:
+
+2017-04-03 Zan Dobersek <zdober...@igalia.com>
+
[GCrypt] Implement AES_KW support
https://bugs.webkit.org/show_bug.cgi?id=170274
Modified: trunk/Source/WebCore/PAL/ChangeLog (214824 => 214825)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-04-03 18:38:37 UTC (rev 214824)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-04-03 18:40:54 UTC (rev 214825)
@@ -1,5 +1,16 @@
2017-04-03 Zan Dobersek <zdober...@igalia.com>
+ [GCrypt] Implement CryptoKeyEC::keySizeInBits(), ::platformGeneratePair()
+ https://bugs.webkit.org/show_bug.cgi?id=170345
+
+ Reviewed by Michael Catanzaro.
+
+ * pal/crypto/gcrypt/Handle.h:
+ (PAL::GCrypt::HandleDeleter<gcry_sexp_t>::operator()): Add a HandleDeleter
+ specialization for the gcry_sexp_t type.
+
+2017-04-03 Zan Dobersek <zdober...@igalia.com>
+
[GCrypt] Implement AES_GCM support
https://bugs.webkit.org/show_bug.cgi?id=170271
Modified: trunk/Source/WebCore/crypto/gcrypt/CryptoKeyECGCrypt.cpp (214824 => 214825)
--- trunk/Source/WebCore/crypto/gcrypt/CryptoKeyECGCrypt.cpp 2017-04-03 18:38:37 UTC (rev 214824)
+++ trunk/Source/WebCore/crypto/gcrypt/CryptoKeyECGCrypt.cpp 2017-04-03 18:40:54 UTC (rev 214825)
@@ -30,36 +30,68 @@
#include "CryptoKeyPair.h"
#include "NotImplemented.h"
+#include <pal/crypto/gcrypt/Handle.h>
+#include <pal/crypto/gcrypt/Utilities.h>
namespace WebCore {
-struct _PlatformECKeyGnuTLS {
-};
+static size_t curveSize(CryptoKeyEC::NamedCurve curve)
+{
+ switch (curve) {
+ case CryptoKeyEC::NamedCurve::P256:
+ return 256;
+ case CryptoKeyEC::NamedCurve::P384:
+ return 384;
+ }
+}
+static const char* curveName(CryptoKeyEC::NamedCurve curve)
+{
+ switch (curve) {
+ case CryptoKeyEC::NamedCurve::P256:
+ return "NIST P-256";
+ case CryptoKeyEC::NamedCurve::P384:
+ return "NIST P-384";
+ }
+}
+
CryptoKeyEC::~CryptoKeyEC()
{
- notImplemented();
+ if (m_platformKey)
+ PAL::GCrypt::HandleDeleter<gcry_sexp_t>()(m_platformKey);
}
size_t CryptoKeyEC::keySizeInBits() const
{
- notImplemented();
-
- return 0;
+ size_t size = curveSize(m_curve);
+ ASSERT(size == gcry_pk_get_nbits(m_platformKey));
+ return size;
}
-Vector<uint8_t> CryptoKeyEC::platformExportRaw() const
+std::optional<CryptoKeyPair> CryptoKeyEC::platformGeneratePair(CryptoAlgorithmIdentifier identifier, NamedCurve curve, bool extractable, CryptoKeyUsageBitmap usages)
{
- notImplemented();
+ PAL::GCrypt::Handle<gcry_sexp_t> genkeySexp;
+ gcry_error_t error = gcry_sexp_build(&genkeySexp, nullptr, "(genkey(ecc(curve %s)))", curveName(curve));
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
- return { };
-}
+ PAL::GCrypt::Handle<gcry_sexp_t> keyPairSexp;
+ error = gcry_pk_genkey(&keyPairSexp, genkeySexp);
+ if (error != GPG_ERR_NO_ERROR) {
+ PAL::GCrypt::logError(error);
+ return std::nullopt;
+ }
-std::optional<CryptoKeyPair> CryptoKeyEC::platformGeneratePair(CryptoAlgorithmIdentifier, NamedCurve, bool, CryptoKeyUsageBitmap)
-{
- notImplemented();
+ PAL::GCrypt::Handle<gcry_sexp_t> publicKeySexp(gcry_sexp_find_token(keyPairSexp, "public-key", 0));
+ PAL::GCrypt::Handle<gcry_sexp_t> privateKeySexp(gcry_sexp_find_token(keyPairSexp, "private-key", 0));
+ if (!publicKeySexp || !privateKeySexp)
+ return std::nullopt;
- return std::nullopt;
+ auto publicKey = CryptoKeyEC::create(identifier, curve, CryptoKeyType::Public, publicKeySexp.release(), true, usages);
+ auto privateKey = CryptoKeyEC::create(identifier, curve, CryptoKeyType::Private, privateKeySexp.release(), extractable, usages);
+ return CryptoKeyPair { WTFMove(publicKey), WTFMove(privateKey) };
}
RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportRaw(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
@@ -83,12 +115,14 @@
return nullptr;
}
-void CryptoKeyEC::platformAddFieldElements(JsonWebKey&) const
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportSpki(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
{
notImplemented();
+
+ return nullptr;
}
-RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportSpki(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
+RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportPkcs8(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
{
notImplemented();
@@ -95,7 +129,7 @@
return nullptr;
}
-Vector<uint8_t> CryptoKeyEC::platformExportSpki() const
+Vector<uint8_t> CryptoKeyEC::platformExportRaw() const
{
notImplemented();
@@ -102,11 +136,16 @@
return { };
}
-RefPtr<CryptoKeyEC> CryptoKeyEC::platformImportPkcs8(CryptoAlgorithmIdentifier, NamedCurve, Vector<uint8_t>&&, bool, CryptoKeyUsageBitmap)
+void CryptoKeyEC::platformAddFieldElements(JsonWebKey&) const
{
notImplemented();
+}
- return nullptr;
+Vector<uint8_t> CryptoKeyEC::platformExportSpki() const
+{
+ notImplemented();
+
+ return { };
}
Vector<uint8_t> CryptoKeyEC::platformExportPkcs8() const
