Skip to content

Commit a67b04a

Browse files
authored
Merge pull request #7 from disig/wip-2.4.0
Update to SoftHSM 2.4.0
2 parents df374e4 + 9c1fb83 commit a67b04a

20 files changed

+159
-147
lines changed

BUILDING.md

Lines changed: 118 additions & 96 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2017, Disig a.s. <opensource@disig.sk>
1+
Copyright (c) 2015-2018, Disig a.s. <opensource@disig.sk>
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

OpenSSL/openssl-1.1.0f.tar.gz

-5.03 MB
Binary file not shown.

OpenSSL/openssl-1.1.0f.tar.gz.asc

Lines changed: 0 additions & 10 deletions
This file was deleted.

OpenSSL/openssl-1.1.0h.tar.gz

5.17 MB
Binary file not shown.

OpenSSL/openssl-1.1.0h.tar.gz.asc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQEcBAABCAAGBQJaukw0AAoJENnE0m0OYESRNZoH/jP9DGnLUsEr58XUE1w+q+P/
4+
JXF/yaBr1LUx9e599zlVNkLyNsqIN0mVfMDgdnjefIwrEGBVBh9YdeNeeZ9Lnhc4
5+
PQCN4vzjUcNv7Jo2DSPmuVoUikntIYM4thrBQuVt031h1+1NQmDpcmU8SESFpM5H
6+
A7N6+p/i/ow5g2G/uqc+Wqy/Jdgwtkq+UPHvxajE7pVLhtY+ue5gU3f6Jb8odTdV
7+
VT1QNzaStN40WiUIHtrykB3F8eg5BvwkmLUqbruy9IEEtYoJvxALVLD1B7t047Tf
8+
Ti1AQ4Ld+NNxbhZeeYMeXTAog3w3DudsSQoOmIN2TiAR6WK44XlS/lu9lK/mFpo=
9+
=SK44
10+
-----END PGP SIGNATURE-----

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ This project provides binary builds and MSI installers of [SoftHSM2](https://git
88

99
## Download
1010

11-
[SoftHSM 2.3.0 "portable" ZIP archive](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.3.0/SoftHSM2-2.3.0-portable.zip)
11+
These packages include both 32-bit and 64-bit versions of PKCS#11 library:
12+
13+
[SoftHSM 2.4.0 "portable" ZIP archive](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.4.0/SoftHSM2-2.4.0-portable.zip)
1214
Requires user to set/modify `SOFTHSM2_CONF` and `PATH` environment variables manually.
1315

14-
[SoftHSM 2.3.0 MSI installer](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.3.0/SoftHSM2-2.3.0.msi)
16+
[SoftHSM 2.4.0 MSI installer](https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.4.0/SoftHSM2-2.4.0.msi)
1517
Does everything automatically.
1618

17-
These packages include both 32-bit and 64-bit versions of PKCS#11 library and require both 32-bit and 64-bit version of [Visual C++ Redistributable for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145
18-
) to be installed on the target system.
19-
2019
## Building the source
2120

2221
See our [Building SoftHSM2 for Windows](BUILDING.md) guide for more details about how these packages were built.

SoftHSM/misc/README.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ project:
99
https://www.opendnssec.org/softhsm/
1010

1111
This package includes both 32-bit and 64-bit build of SoftHSM 2.3.0 statically
12-
linked to OpenSSL 1.1.0f. It requires both 32-bit and 64-bit version of Visual
13-
C++ Redistributable for Visual Studio 2015 to be installed on the target
14-
system. These can be downloaded from:
15-
16-
http://www.microsoft.com/en-us/download/details.aspx?id=48145
17-
18-
Latest version of SoftHSM2 for Windows can be downloaded from:
12+
linked to OpenSSL 1.1.0h. Latest version of SoftHSM2 for Windows can be
13+
downloaded from:
1914

2015
https://github.com/disig/SoftHSM2-for-Windows
2116

SoftHSM/misc/softhsm2-dump-file.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
SOFTHSM2-DUMP-FILE(1) General Commands Manual SOFTHSM2-DUMP-FILE(1)
22

3-
4-
53
NAME
64
softhsm2-dump-file - SoftHSM object file dump
75

@@ -18,6 +16,4 @@ OPTIONS
1816
--help, -h
1917
Show the help information.
2018

21-
22-
2319
SoftHSM 20 March 2014 SOFTHSM2-DUMP-FILE(1)

SoftHSM/misc/softhsm2-keyconv.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
SOFTHSM2-KEYCONV(1) General Commands Manual SOFTHSM2-KEYCONV(1)
22

3-
4-
53
NAME
64
softhsm2-keyconv - converting from BIND to PKCS#8 key file format
75

@@ -46,6 +44,4 @@ SEE ALSO
4644
softhsm2-migrate(1), softhsm2-util(1), softhsm2.conf(5), openssl(1),
4745
named(1), dnssec-keygen(1), dnssec-signzone(1)
4846

49-
50-
5147
SoftHSM 20 March 2014 SOFTHSM2-KEYCONV(1)

0 commit comments

Comments
 (0)