Updated bcrypt-BCryptGenerateKeyPair patchset

This is to fix the macos build.
This commit is contained in:
Alistair Leslie-Hughes 2019-02-05 13:46:15 +11:00
parent 785d3c2244
commit 0f48c0caac

View File

@ -1,4 +1,4 @@
From fa9138a3a147c99a5325e7b05a44145bc864d649 Mon Sep 17 00:00:00 2001
From 029720a4dd22e2245637a0967478fc409471dba7 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Tue, 5 Feb 2019 09:00:02 +1100
Subject: [PATCH] bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH
@ -9,10 +9,11 @@ Subject: [PATCH] bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH
dlls/bcrypt/bcrypt_internal.h | 7 +-
dlls/bcrypt/bcrypt_main.c | 56 ++++++++++++++-
dlls/bcrypt/gnutls.c | 162 +++++++++++++++++++++++++++++++++++++++---
dlls/bcrypt/macos.c | 6 ++
dlls/bcrypt/tests/bcrypt.c | 94 ++++++++++++++++++------
dlls/ncrypt/ncrypt.spec | 4 +-
include/bcrypt.h | 12 +++-
7 files changed, 297 insertions(+), 42 deletions(-)
8 files changed, 303 insertions(+), 42 deletions(-)
diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
index f4d9a57..052a099 100644
@ -440,6 +441,23 @@ index 69276be..fe6fe9c 100644
heap_free( key );
return STATUS_SUCCESS;
}
diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
index a6eaee8..0e0ed83 100644
--- a/dlls/bcrypt/macos.c
+++ b/dlls/bcrypt/macos.c
@@ -205,6 +205,12 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO
return STATUS_NOT_IMPLEMENTED;
}
+NTSTATUS key_asymmetric_generate( struct key *key )
+{
+ FIXME( "not implemented on Mac\n" );
+ return STATUS_NOT_IMPLEMENTED;
+}
+
NTSTATUS key_destroy( struct key *key )
{
if (key->u.s.ref_encrypt) CCCryptorRelease( key->u.s.ref_encrypt );
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index c635fcb..f88e48f 100644
--- a/dlls/bcrypt/tests/bcrypt.c