duckdb 0.5.2-dev671.0 → 0.5.2-dev674.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.5.2-dev671.0",
+  "version": "0.5.2-dev674.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -139886,8 +139886,12 @@ inline std::string GetDLError(void) {
 namespace duckdb_mbedtls {
 class MbedTlsWrapper {
 public:
+	static void ComputeSha256Hash(const char* in, size_t in_len, char* out);
 	static std::string ComputeSha256Hash(const std::string& file_content);
 	static bool IsValidSha256Signature(const std::string& pubkey, const std::string& signature, const std::string& sha256_hash);
+	static void Hmac256(const char* key, size_t key_len, const char* message, size_t message_len, char* out);
+
+	static constexpr size_t SHA256_HASH_BYTES = 32;
 };
 }
 
@@ -328632,16 +328636,20 @@ openssl pkeyutl -sign -in hash -inkey private.pem -pkeyopt digest:sha256 -out du
 */
 
 
-string MbedTlsWrapper::ComputeSha256Hash(const string& file_content) {
-	string hash;
-	hash.resize(32);
+void MbedTlsWrapper::ComputeSha256Hash(const char* in, size_t in_len, char* out) {
 
 	mbedtls_sha256_context sha_context;
 	mbedtls_sha256_init(&sha_context);
-	if(mbedtls_sha256_starts(&sha_context, false) || mbedtls_sha256_update(&sha_context, (const unsigned char*) file_content.data(), file_content.size()) || mbedtls_sha256_finish(&sha_context, (unsigned char*)hash.data())) {
+	if(mbedtls_sha256_starts(&sha_context, false) || mbedtls_sha256_update(&sha_context, (const unsigned char*) in, in_len) || mbedtls_sha256_finish(&sha_context, (unsigned char*)out)) {
 		throw runtime_error("SHA256 Error");
 	}
 	mbedtls_sha256_free(&sha_context);
+}
+
+string MbedTlsWrapper::ComputeSha256Hash(const string& file_content) {
+	string hash;
+	hash.resize(MbedTlsWrapper::SHA256_HASH_BYTES);
+	ComputeSha256Hash(file_content.data(), file_content.size(), (char*)hash.data());
 	return hash;
 }
 
@@ -328668,6 +328676,22 @@ bool MbedTlsWrapper::IsValidSha256Signature(const std::string &pubkey, const std
 	return valid;
 }
 
+// used in s3fs
+void MbedTlsWrapper::Hmac256(const char* key, size_t key_len, const char* message, size_t message_len, char* out) {
+	mbedtls_md_context_t hmac_ctx;
+	const mbedtls_md_info_t *md_type = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
+	if (!md_type) {
+		throw runtime_error("failed to init hmac");
+	}
+
+	if (mbedtls_md_setup(&hmac_ctx, md_type, 1) ||
+	    mbedtls_md_hmac_starts(&hmac_ctx, (const unsigned char *) key, key_len) ||
+	    mbedtls_md_hmac_update(&hmac_ctx, (const unsigned char *)message, message_len) ||
+	    mbedtls_md_hmac_finish(&hmac_ctx, (unsigned char *) out)) {
+		throw runtime_error("HMAC256 Error");
+	}
+	mbedtls_md_free(&hmac_ctx);
+}
 
 // LICENSE_CHANGE_END
 

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "91a9fc49a"
-#define DUCKDB_VERSION "v0.5.2-dev671"
+#define DUCKDB_SOURCE_ID "0543dbc6f"
+#define DUCKDB_VERSION "v0.5.2-dev674"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //