v3.4.4-2

Author: cgohlke

.github/workflows/wheel.yml

@@ -4,11 +4,11 @@ on:
   workflow_dispatch:
 
 env:
-  OPENSSL_VER: openssl-1.1.1w
+  OPENSSL_VER: openssl-3.0.17
   OPENLDAP_VER: openldap-2.4.59
   PYTHONLDAP_VER: python-ldap-3.4.4
   CIBW_TEST_COMMAND: python -c"import ldap;print(ldap.__version__)"
-  CIBW_SKIP: "pp* cp36* cp37* cp38* cp39*"
+  CIBW_SKIP: "cp38* cp39* cp310*"
   MSBUILDTREATHIGHERTOOLSVERSIONASCURRENT: 1
 
 jobs:
@@ -17,12 +17,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022]
+        os: [windows-latest]
     env:
       VS_PLATFORM: x64
       OPENSSL_CONFIG: VC-WIN64A-masm
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: microsoft/[email protected]
         with:
           msbuild-architecture: x64
@@ -35,7 +35,7 @@ jobs:
         shell: cmd
       - run: build_python-ldap.cmd
         shell: cmd
-      - uses: pypa/cibuildwheel@v2.22.0
+      - uses: pypa/cibuildwheel@v3.1.4
         env:
           CIBW_ARCHS_WINDOWS: AMD64
       - uses: actions/upload-artifact@v4
@@ -47,12 +47,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022]
+        os: [windows-latest]
     env:
       VS_PLATFORM: Win32
       OPENSSL_CONFIG: VC-WIN32
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: microsoft/[email protected]
         with:
           msbuild-architecture: x86
@@ -66,7 +66,7 @@ jobs:
         shell: cmd
       - run: build_python-ldap.cmd
         shell: cmd
-      - uses: pypa/cibuildwheel@v2.22.0
+      - uses: pypa/cibuildwheel@v3.1.4
         env:
           CIBW_ARCHS_WINDOWS: x86
       - uses: actions/upload-artifact@v4
@@ -79,12 +79,12 @@ jobs:
   #  runs-on: ${{ matrix.os }}
   #  strategy:
   #    matrix:
-  #      os: [windows-2022]
+  #      os: [windows-latest]
   #  env:
   #    VS_PLATFORM: ARM64
   #    OPENSSL_CONFIG: VC-WIN64-ARM
   #  steps:
-  #    - uses: actions/checkout@v4
+  #    - uses: actions/checkout@v5
   #    - uses: microsoft/[email protected]
   #      with:
   #        msbuild-architecture: arm64
@@ -93,7 +93,7 @@ jobs:
   #        arch: amd64_arm64
   #    - run: build.cmd
   #      shell: cmd
-  #    - uses: pypa/cibuildwheel@v2.22.0
+  #    - uses: pypa/cibuildwheel@v3.1.4
   #      env:
   #        CIBW_SKIP: "pp* cp36* cp37* cp38* cp39* cp310*"
   #        CIBW_ARCHS_WINDOWS: ARM64

README.md

@@ -4,6 +4,6 @@ Build [python-ldap](https://github.com/python-ldap/python-ldap) wheels for Windo
 
 The wheels can be downloaded from the [Releases](https://github.com/cgohlke/python-ldap-build/releases) page.
 
-Install a wheel on the command line, for example for Python 3.13 64-bit:
+Install a wheel on the command line, for example for Python 3.14 64-bit:
 
-    py.exe -3.13 -m pip install python_ldap-3.4.4-cp313-cp313-win_amd64.whl
+    py.exe -3.14 -m pip install python_ldap-3.4.4-cp314-cp314-win_amd64.whl

build_openssl.cmd

@@ -2,7 +2,7 @@
 @echo on
 setlocal
 
-:: set OPENSSL_VER=openssl-1.1.1w
+:: set OPENSSL_VER=openssl-3.0.17
 :: set OPENSSL_CONFIG=VC-WIN64A-masm
 :: set PATH=%PATH%;X:\Perl\bin
 

openldap.diff

@@ -1,3 +1,16 @@
+diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
+index 498f805..00e8570 100644
+--- a/libraries/libldap/tls_o.c
++++ b/libraries/libldap/tls_o.c
+@@ -655,7 +655,7 @@ tlso_get_cert( SSL *s )
+ 	if (SSL_get_verify_result(s)) {
+ 		return NULL;
+ 	}
+-	return SSL_get_peer_certificate(s);
++	return SSL_get1_peer_certificate(s);
+ }
+ 
+ static int
 diff --git a/include/ac/socket.h b/include/ac/socket.h
 index 7b9252d..f6344b9 100644
 --- a/include/ac/socket.h

openssl.diff

@@ -1,8 +1,13 @@
 diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index f815a09b..320e09aa 100644
+index 280a75b2..481b24d8 100644
 --- a/Configurations/10-main.conf
 +++ b/Configurations/10-main.conf
-@@ -1281,7 +1281,7 @@ my %targets = (
+@@ -1362,11 +1362,11 @@ my %targets = (
+                                        },
+                                        release =>
+                                        sub {
+-                                           ($disabled{shared} ? "" : "/MD");
++                                           ($disabled{shared} ? "/MD" : "/MD");
                                         })),
          defines          => add(picker(default => [], # works as type cast
                                         debug   => [ "DEBUG", "_DEBUG" ])),
@@ -11,16 +16,16 @@ index f815a09b..320e09aa 100644
          # Following might/should appears controversial, i.e. defining
          # /MDd without evaluating $disabled{shared}. It works in
          # non-shared build because static library is compiled with /Zl
-@@ -1294,7 +1294,7 @@ my %targets = (
+@@ -1379,7 +1379,7 @@ my %targets = (
          # prefer [non-debug] openssl.exe to be free from Micorosoft RTL
          # redistributable.
          bin_cflags       => add(picker(debug   => "/MDd",
 -                                       release => sub { $disabled{shared} ? "/MT" : () },
-+                                       release => sub { $disabled{shared} ? "/MD" : () },
++                                       release => sub { $disabled{shared} ? "/MD" : "/MD" },
                                        )),
          bin_lflags       => add("/subsystem:console /opt:ref"),
          ex_libs          => add(sub {
-@@ -1363,7 +1363,7 @@ my %targets = (
+@@ -1447,7 +1447,7 @@ my %targets = (
              combine('/GF /Gy',
                      sub { vc_wince_info()->{cflags}; },
                      sub { `cl 2>&1` =~ /Version ([0-9]+)\./ && $1>=14