From 5e6f3ac0b05672363453acc81be9276a86ad5dcd Mon Sep 17 00:00:00 2001 From: lsh123 Date: Wed, 7 Aug 2024 11:05:03 -0400 Subject: [PATCH] (windows) Disabled iconv support by default (#834) --- .github/workflows/make-check.yml | 2 +- docs/index.html | 2 +- win32/README.md | 62 +++----------------------------- win32/building-dependencies.txt | 43 ---------------------- win32/configure.js | 6 ++-- win32/mycfg.bat | 2 +- 6 files changed, 10 insertions(+), 107 deletions(-) delete mode 100644 win32/building-dependencies.txt diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml index fd598210e..55e9b1848 100755 --- a/.github/workflows/make-check.yml +++ b/.github/workflows/make-check.yml @@ -243,7 +243,7 @@ jobs: shell: cmd run: | call "${{ env.VISUAL_STUDIO_ROOT }}\VC\Auxiliary\Build\vcvars64.bat" - cscript configure.js pedantic=yes werror=yes static=yes iconv=no ^ + cscript configure.js pedantic=yes werror=yes static=yes ^ crypto=${{ matrix.crypto }} ${{ matrix.config_flags }} ^ prefix=${{ env.INSTALL_FOLDER }}\xmlsec.build ^ include=${{ env.INSTALL_FOLDER }}\libxml2\include;${{ env.INSTALL_FOLDER }}\libxml2\include\libxml2;${{ env.INSTALL_FOLDER }}\libxslt\include;${{ env.INSTALL_FOLDER }}\openssl\include;%MSSDK_INCLUDE% ^ diff --git a/docs/index.html b/docs/index.html index 5a8af3323..2ce05e26c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -70,7 +70,7 @@

XML Security Library

  • TBD
    The XML Security Library 1.3.6 release includes the following changes:
    • diff --git a/win32/README.md b/win32/README.md index 2998356c4..f98573b1a 100644 --- a/win32/README.md +++ b/win32/README.md @@ -145,13 +145,6 @@ nmake nmake install ``` -In CygWin shell: - -``` -cd /cygdrive/c/local/distro/libxml2 -7z a ../libxml2--noiconv-win-x64.7z bin/ include/ lib/ -``` - ### LibXSLT In MSVC x64 native tools shell: @@ -163,47 +156,15 @@ nmake nmake install ``` -In Cygwin shell: - -``` -cd /cygdrive/c/local/distro/libxslt -7z a ../libxslt--noiconv-win-x64.7z bin/ include/ lib/ -``` - -## OpenSSL 1.1 - -In MSVC x64 native tools shell: - -``` -cd c:\ -C:\Strawberry\perl\bin\perl.exe Configure no-asm --prefix=c:\local\distro\openssl-1.1 VC-WIN64A -nmake -nmake install -``` - -In Cygwin shell: - -``` -cd /cygdrive/c/local/distro/openssl-1.1 -7z a ../openssl--x64.7z bin/ html/ include/ lib/ -``` - ## OpenSSL 3.x In MSVC x64 native tools shell: ``` -cd c:\ -C:\Strawberry\perl\bin\perl.exe Configure no-asm --prefix=c:\local\distro\openssl --release VC-WIN64A +cd c:\ +C:\Strawberry\perl\bin\perl.exe Configure --prefix=c:\local\distro\openssl --release VC-WIN64A nmake -nmake install -``` - -In Cygwin shell: - -``` -cd /cygdrive/c/local/distro/openssl -7z a ../openssl--x64.7z bin/ html/ include/ lib/ +nmake install_sw ``` ## XMLSec @@ -212,26 +173,11 @@ In MSVC x64 native tools shell: ``` cd c:\ -cscript configure.js pedantic=yes with-dl=yes iconv=no cruntime=/MD xslt=yes crypto=openssl unicode=yes prefix=C:\local\distro\xmlsec include=C:\local\distro\libxml2\include;C:\local\distro\libxml2\include\libxml2;C:\local\distro\libxslt\include;C:\local\distro\openssl\include; lib=C:\local\distro\libxml2\lib;C:\local\distro\libxslt\lib;C:\local\distro\openssl\lib +cscript configure.js crypto=openssl,mscng xslt=yes unicode=yes with-dl=yes pedantic=yes werror=yes cruntime=/MD prefix=C:\local\distro\xmlsec include=C:\local\distro\libxml2\include;C:\local\distro\libxml2\include\libxml2;C:\local\distro\libxslt\include;C:\local\distro\openssl\include; lib=C:\local\distro\libxml2\lib;C:\local\distro\libxslt\lib;C:\local\distro\openssl\lib nmake nmake install ``` -In Cygwin shell: - -``` -cd /cygdrive/c/local/distro/openssl -7z a ../openssl--x64.7z bin/ html/ include/ lib/ -``` - -## Archive -In Cygwin shell: -``` -cd C:\local\distro -zip -r xmlsec1--win64.zip libxml2 libxslt openssl xmlsec README.md -``` - - ## Authors - March 2002, Igor Zlatkovic - July, 2022, Aleksey Sanin diff --git a/win32/building-dependencies.txt b/win32/building-dependencies.txt deleted file mode 100644 index 47a1e4a09..000000000 --- a/win32/building-dependencies.txt +++ /dev/null @@ -1,43 +0,0 @@ -*** Pre-requisites -1) Install Cygwin with git, vim, wget, ... -2) Add c:\Cygwin64\bin and c:\Cygwin64\lib to the PATH environment variable -3) Install Strawberry Perl -4) Install Visual Studio with C++ - - -*** LibXML2 -1) Inside Cygwin prompt: -$ cd /cygdrive/c/local/dev -$ git clone git@github.com:GNOME/libxml2.git - -2) Inside "x64 Native tools command prompt": -> cd c:\local\dev\libxml2\win32 -> cscript configure.js prefix=c:\local static=no iconv=no debug=yes -> nmake -> nmake install - -*** LibXSLT -1) Inside Cygwin prompt: -$ cd /cygdrive/c/local/dev -$ git clone git@github.com:GNOME/libxslt.git - -2) Inside "x64 Native tools command prompt": -> cd c:\local\dev\libxslt\win32 -> cscript configure.js prefix=c:\local static=no iconv=no debug=yes include=c:\local\include\libxml2 lib=c:\local\lib -> nmake -> nmake install - - -*** OpenSSL ----------- -1) Inside Cygwin prompt: -$ cd /cygdrive/c/local/dev -$ wget -$ tar xfvz - -2) Inside "x64 Native tools command prompt": -> cd c:\local\dev\ -> perl Configure no-asm --prefix=c:\local\openssl- VC-WIN64A -> nmake -> nmake install - diff --git a/win32/configure.js b/win32/configure.js index e3a118c7d..b6f51c300 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -49,9 +49,9 @@ var withNss = 0; var withMSCrypto = 0; var withMSCng = 0; var withLibXSLT = 1; -var withIconv = 1; -var withFTP = 0; /* disable ftp by default */ -var withHTTP = 0; /* disable http by default */ +var withIconv = 0; /* disable iconv by default */ +var withFTP = 0; /* disable ftp by default */ +var withHTTP = 0; /* disable http by default */ var withGost = 0; var withRsaPkcs15 = 1; var withLegacyCrypto = 0; diff --git a/win32/mycfg.bat b/win32/mycfg.bat index 6bfd5050a..80d25b889 100644 --- a/win32/mycfg.bat +++ b/win32/mycfg.bat @@ -18,7 +18,7 @@ SET XMLSEC_PREFIX=%PREFIX%\xmlsec SET XMLSEC_INCLUDE=%LIBXML2_PREFIX%\include;%LIBXML2_PREFIX%\include\libxml2;%LIBXSLT_PREFIX%\include;%OPENSSL_PREFIX%\include;%MSSDK_INCLUDE% SET XMLSEC_LIB=%LIBXML2_PREFIX%\lib;%LIBXSLT_PREFIX%\lib;%OPENSSL_PREFIX%\lib;%MSSDK_LIB% -SET XMLSEC_OPTIONS=debug=yes pedantic=yes werror=yes with-dl=yes iconv=no cruntime=/MD xslt=yes crypto=%XMLSEC_CRYPTO% unicode=yes legacy-crypto=yes http=no +SET XMLSEC_OPTIONS=debug=yes pedantic=yes werror=yes with-dl=yes cruntime=/MD xslt=yes crypto=%XMLSEC_CRYPTO% unicode=yes legacy-crypto=yes http=no nmake clean del /F Makefile configure.txt