diff --git a/.github/workflows/publish-central.yml b/.github/workflows/publish-central.yml
index c8026ed..cb4dadb 100644
--- a/.github/workflows/publish-central.yml
+++ b/.github/workflows/publish-central.yml
@@ -39,4 +39,5 @@ jobs:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
\ No newline at end of file
+ MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+ MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
diff --git a/.github/workflows/publish-github.yml b/.github/workflows/publish-github.yml
index 9b46bd6..c5c1197 100644
--- a/.github/workflows/publish-github.yml
+++ b/.github/workflows/publish-github.yml
@@ -26,6 +26,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
+ MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
notify:
runs-on: ubuntu-latest
needs: [publish]
diff --git a/integrations-win.vcxproj b/integrations-win.vcxproj
index 4ae64ff..dfd972b 100644
--- a/integrations-win.vcxproj
+++ b/integrations-win.vcxproj
@@ -124,7 +124,7 @@
-
+
diff --git a/pom.xml b/pom.xml
index 208d251..6843451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.cryptomator
integrations-win
- 1.4.0
+ 1.4.1
Cryptomator Integrations for Windows
Provides optional Windows services used by Cryptomator
diff --git a/src/main/native/org_cryptomator_windows_keychain_WindowsHello_Native.cpp b/src/main/native/org_cryptomator_windows_keychain_WindowsHello_Native.cpp
index 6f15a64..b6b8e07 100644
--- a/src/main/native/org_cryptomator_windows_keychain_WindowsHello_Native.cpp
+++ b/src/main/native/org_cryptomator_windows_keychain_WindowsHello_Native.cpp
@@ -21,7 +21,7 @@ using namespace Windows::Security::Cryptography::Core;
using namespace Windows::Storage::Streams;
static std::atomic g_promptFocusCount{ 0 };
-static IBuffer info = CryptographicBuffer::ConvertStringToBinary(L"EncryptionKey", BinaryStringEncoding::Utf8);
+static auto HKDF_INFO = L"org.cryptomator.windows.keychain.windowsHello";
// Helper methods for conversion
std::vector jbyteArrayToVector(JNIEnv* env, jbyteArray array) {
@@ -96,7 +96,7 @@ IBuffer DeriveKeyUsingHKDF(const IBuffer& inputData, const IBuffer& salt, uint32
if (expandKey.KeySize() < macProvider.MacLength()) {
throw std::runtime_error("Key provided by HMAC_SHA256 implementation is shorter than the HMAC length.");
}
- int maxKeySize = 255 * macProvider.MacLength();
+ auto maxKeySize = 255 * macProvider.MacLength();
if (keySizeInBytes > maxKeySize) {
throw std::runtime_error("HKDF requires keySizeInBytes to be at most " + std::to_string(maxKeySize) + " bytes.");
}
@@ -153,6 +153,7 @@ bool deriveEncryptionKey(const std::wstring keyId, const std::vector& c
// Derive the encryption/decryption key using HKDF
const auto response = signature.Result();
+ IBuffer info = CryptographicBuffer::ConvertStringToBinary(HKDF_INFO, BinaryStringEncoding::Utf8);
key = DeriveKeyUsingHKDF(response, challengeBuffer, 32, info); // needs to be 32 bytes for SHA256
return true;
diff --git a/src/main/native/org_cryptomator_windows_uiappearnce_WinAppearance_Native.cpp b/src/main/native/org_cryptomator_windows_uiappearance_WinAppearance_Native.cpp
similarity index 100%
rename from src/main/native/org_cryptomator_windows_uiappearnce_WinAppearance_Native.cpp
rename to src/main/native/org_cryptomator_windows_uiappearance_WinAppearance_Native.cpp