Skip to content

Commit

Permalink
Initial OpenSSL 3.4 integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Futaura committed Oct 23, 2024
1 parent 219ef88 commit dfc4993
Show file tree
Hide file tree
Showing 62 changed files with 13,542 additions and 217 deletions.
8 changes: 8 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## AmiSSL 5.18 (23.10.2024)

- Switched to OpenSSL 3.4, with full compatibility with the latest
OpenSSL 3.4.0 (22.10.2024) version, which includes new features,
improvements and bug fixes.
- Updated root certificates to latest Mozilla-based bundle provided
by https://curl.se/docs/caextract.html dated 24.9.2024.

## AmiSSL 5.17 (4.9.2024)

- Updated OpenSSL backend to full compatibility with the latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ endif
# none - because we want to compile with -Wall all the time

VERSION=5
REVISION=17
REVISION=18

include openssl/VERSION.dat
VERSIONNAME=$(MAJOR)$(MINOR)$(PATCH)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ it being a shared library, it can be used by several Amiga applications at
the same time, without wasting resources.

AmiSSL v5 is a new major release which has been updated with full
compatibility with OpenSSL 3.3. This includes important security related
compatibility with OpenSSL 3.4. This includes important security related
fixes, a built-in HTTP(S) client and comes with the latest encryption
ciphers which are required nowadays to connect to modern SSL-based services
such as HTTPS and SSH.
Expand Down Expand Up @@ -79,7 +79,7 @@ A port of the OpenSSL tool is also included and usually installed to `AmiSSL:`
or `C:` during installation. It is a "command line tool for using the various
cryptography functions of OpenSSL's crypto library from the shell". The
documentation for the OpenSSL tool is included in the archive and can also
be reviewed [online](https://www.openssl.org/docs/man3.3/man1/openssl.html).
be reviewed [online](https://www.openssl.org/docs/man3.4/man1/openssl.html).
A sample openssl.cnf file is also installed to `AmiSSL:`, if it doesn't already
exist, along with the CA.pl helper script, both of which aid the certificate
generation features of the OpenSSL tool. The tsget.pl script is also included.
Expand Down
4 changes: 2 additions & 2 deletions README.update-openssl
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ HowTo update the OpenSSL version in "openssl/":
1. To merge in a new OpenSSL version execute the following git command
within a working copy of the AmiSSL repository:

$ git subtree pull --prefix openssl --squash https://github.com/openssl/openssl.git openssl-3.3.0
$ git subtree pull --prefix openssl --squash https://github.com/openssl/openssl.git openssl-3.4.0

Note, that "openssl-3.3.0" can be replaced by any branch or tag of
Note, that "openssl-3.4.0" can be replaced by any branch or tag of
the OpenSSL git repository at github.com.

After execution of the above subtree command git will try to merge in all
Expand Down
4 changes: 2 additions & 2 deletions dist/AmiSSL.readme
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ it being a shared library, it can be used by several Amiga applications at
the same time, without wasting resources.

AmiSSL v5 is a new major release which has been updated with full
compatibility with OpenSSL 3.3. This includes important security related
compatibility with OpenSSL 3.4. This includes important security related
fixes, a built-in HTTP(S) client and comes with the latest encryption
ciphers which are required nowadays to connect to modern SSL-based services
such as HTTPS and SSH.
Expand Down Expand Up @@ -76,7 +76,7 @@ A port of the OpenSSL tool is also included and usually installed to AmiSSL:
or C: during installation. It is a "command line tool for using the various
cryptography functions of OpenSSL's crypto library from the shell". The
documentation for the OpenSSL tool is included in the archive and can also
be reviewed online: https://www.openssl.org/docs/man3.3/man1/openssl.html.
be reviewed online: https://www.openssl.org/docs/man3.4/man1/openssl.html.
A sample openssl.cnf file is also installed to AmiSSL:, if it doesn't already
exist, along with the CA.pl helper script, both of which aid the certificate
generation features of the OpenSSL tool. The tsget.pl script is also included.
Expand Down
2 changes: 2 additions & 0 deletions include/amissl/amissl.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
#ifndef OPENSSL_NO_IDEA
#include <openssl/idea.h>
#endif
#include <openssl/indicator.h>
#include <openssl/kdf.h>
#include <openssl/lhash.h>
#ifndef OPENSSL_NO_MD2
Expand Down Expand Up @@ -174,6 +175,7 @@
#include <openssl/whrlpool.h>
#endif
#include <openssl/x509.h>
#include <openssl/x509_acert.h>
#include <openssl/x509_vfy.h>
#include <openssl/x509v3.h>

Expand Down
Loading

0 comments on commit dfc4993

Please sign in to comment.