Skip to content

Commit f3a59c7

Browse files
authored
Remove MD5 for NSS 3.59 and above; enable nss test on osx and mingw (issue lsh123#305) (lsh123#306)
1 parent c375a76 commit f3a59c7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/make-check.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ jobs:
4444
- static_linking: false
4545
steps:
4646
- name: install dependencies
47-
# nss is disabled for now
4847
run: |
4948
brew update
5049
brew install automake autoconf libtool
51-
brew install libxml2 libxslt
52-
brew install openssl libgcrypt gnutls
50+
# brew install libxml2 libxslt
51+
brew install openssl nspr nss libgcrypt gnutls
5352
- uses: actions/checkout@v2
5453
- run: mkdir build
5554
- name: configure
@@ -101,6 +100,8 @@ jobs:
101100
mingw-w64-${{ matrix.arch }}-libxml2
102101
mingw-w64-${{ matrix.arch }}-libxslt
103102
mingw-w64-${{ matrix.arch }}-openssl
103+
mingw-w64-${{ matrix.arch }}-nspr
104+
mingw-w64-${{ matrix.arch }}-nss
104105
mingw-w64-${{ matrix.arch }}-gnutls
105106
- run: git config --global core.autocrlf input
106107
shell: bash

include/xmlsec/nss/crypto.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
#include <xmlsec/transforms.h>
2020
#include <xmlsec/dl.h>
2121

22+
23+
/* MD5 was removed from NSS */
24+
#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
25+
#define XMLSEC_NO_MD5 1
26+
#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
27+
2228
#ifdef __cplusplus
2329
extern "C" {
2430
#endif /* __cplusplus */

0 commit comments

Comments
 (0)