Fixes for Windows, drop R-4.1

jeroen · Jan 27, 2025 · dd0eee3 · dd0eee3
1 parent 3e82496
commit dd0eee3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -20,8 +20,8 @@ jobs:
         config:
           - {os: macos-13,        r: 'release'}
           - {os: macos-14,        r: 'release'}
-          - {os: windows-latest,  r: '4.1'}
           - {os: windows-latest,  r: '4.2'}
+          - {os: windows-latest,  r: '4.3'}
           - {os: windows-latest,  r: 'release'}
           - {os: windows-2025,    r: 'devel'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,7 +5,7 @@ Description: High-performance MongoDB client based on 'mongo-c-driver' and 'json
     Includes support for aggregation, indexing, map-reduce, streaming, encryption,
     enterprise authentication, and GridFS. The online user manual provides an overview 
     of the available methods in the package: <https://jeroen.github.io/mongolite/>.
-Version: 2.8.2
+Version: 3.0.0
 Authors@R: c(
     person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+3.0.0
+ - Update vendored mongo-c-driver to 1.29.2
+ - On Windows we need Win-7 and therefore R-4.2 or newer
+
 2.8.2
  - Add function bson_read() to read mongodb dumps
 

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -9,7 +9,7 @@ PKG_CPPFLAGS = \
 
 PKG_LIBS = \
 	-L. -Lmongoc -lstatmongoc \
-	-lbcrypt -lgdi32 -lcrypt32 -lws2_32 -lsecur32 -ldnsapi -lz
+	-lbcrypt -lgdi32 -lcrypt32 -lbcrypt -lws2_32 -lsecur32 -ldnsapi -lz
 
 LIBBSON=bson/bcon.o bson/bson-clock.o bson/bson-context.o common/common-md5.o \
 	bson/bson-error.o bson/bson-iso8601.o bson/bson-iter.o bson/bson-json.o \

diff --git a/src/kms/kms_crypto_windows.c b/src/kms/kms_crypto_windows.c
@@ -168,7 +168,7 @@ kms_sign_rsaes_pkcs1_v1_5 (void *unused_ctx,
 
    success = CryptDecodeObjectEx (X509_ASN_ENCODING,
                                   PKCS_PRIVATE_KEY_INFO,
-                                  private_key,
+                                  (BYTE*) private_key,
                                   (DWORD) private_key_len,
                                   0,
                                   NULL,
@@ -182,7 +182,7 @@ kms_sign_rsaes_pkcs1_v1_5 (void *unused_ctx,
 
    success = CryptDecodeObjectEx (X509_ASN_ENCODING,
                                   PKCS_PRIVATE_KEY_INFO,
-                                  private_key,
+                                  (BYTE*) private_key,
                                   (DWORD) private_key_len,
                                   0,
                                   NULL,