Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl-3.1.6+quic #167

Merged
merged 65 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
56ef779
QUIC: Add support for BoringSSL QUIC APIs
tmshort Apr 12, 2019
46491ad
QUIC: New method to get QUIC secret length
tmshort Jun 14, 2019
e828d37
QUIC: Make temp secret names less confusing
tmshort Aug 15, 2019
1d3ee5f
QUIC: Move QUIC transport params to encrypted extensions
tmshort Aug 15, 2019
af15a7c
QUIC: Use proper secrets for handshake
tmshort Aug 15, 2019
5c165fd
QUIC: Handle partial handshake messages
tmshort Aug 15, 2019
537f114
QUIC: Fix duplicate word in docs
tmshort Aug 26, 2019
797a659
QUIC: Fix quic_transport constructors/parsers
tmshort Aug 26, 2019
60f30f6
QUIC: Reset init state in SSL_process_quic_post_handshake()
tmshort Aug 29, 2019
7374a8c
QUIC: Don't process an incomplete message
tmshort Aug 29, 2019
92cf7fd
QUIC: Quick fix: s2c to c2s for early secret
tmshort Aug 30, 2019
561cbc1
QUIC: Add client early traffic secret storage
tmshort Aug 30, 2019
d884cb1
QUIC: Add OPENSSL_NO_QUIC wrapper
tmshort Aug 30, 2019
e65b1ea
QUIC: Correctly disable middlebox compat
tmshort Aug 30, 2019
6132111
QUIC: Move QUIC code out of tls13_change_cipher_state()
tmshort Aug 30, 2019
fc0d75f
QUIC: Tweeks to quic_change_cipher_state()
tmshort Aug 30, 2019
7cc5a1e
QUIC: Add support for more secrets
tmshort Sep 24, 2019
5dd9d67
QUIC: Fix resumption secret
tmshort Nov 12, 2019
e93ae2b
QUIC: Handle EndOfEarlyData and MaxEarlyData
tmshort Nov 13, 2019
bf4fdb5
QUIC: Fall-through for 0RTT
tmshort Jan 7, 2020
2bf65dc
QUIC: Some cleanup for the main QUIC changes
kaduk Apr 22, 2020
e0d85db
QUIC: Prevent KeyUpdate for QUIC
kaduk May 11, 2020
915ab85
QUIC: Test KeyUpdate rejection
kaduk May 11, 2020
a66edc0
QUIC: Buffer all provided quic data
kaduk Aug 31, 2020
1f8f9d3
QUIC: Enforce consistent encryption level for handshake messages
kaduk Sep 1, 2020
2b1e7b0
QUIC: add v1 quic_transport_parameters
tmshort Dec 12, 2020
c83e293
QUIC: return success when no post-handshake data
tmshort Jan 5, 2021
a0f7bc2
QUIC: __owur makes no sense for void return values
kaduk Jan 15, 2021
aa6fd4d
QUIC: remove SSL_R_BAD_DATA_LENGTH (unused)
tmshort Feb 19, 2021
016daa9
QUIC: Update shared library version
tmshort Mar 3, 2021
7c4303f
QUIC: Swap around README files
tmshort Mar 3, 2021
a222dba
QUIC: Fix 3.0.0 GitHub CI
tmshort Mar 3, 2021
edccd04
QUIC: SSLerr() -> ERR_raise(ERR_LIB_SSL)
tmshort Mar 3, 2021
7509e2b
QUIC: Add compile/run-time checking for QUIC
tmshort Mar 5, 2021
da8cef1
QUIC: Add early data support (#11)
tatsuhiro-t Mar 11, 2021
cd7716d
QUIC: Make SSL_provide_quic_data accept 0 length data (#13)
tatsuhiro-t Mar 11, 2021
b57cbf6
QUIC: Process multiple post-handshake messages in a single call (#16)
tatsuhiro-t Mar 12, 2021
f720de9
QUIC: Tighten up some language in SSL_CTX_set_quic_method.pod (#18)
kaduk Mar 12, 2021
f7c8b32
QUIC: Fix typo in README.md (#19)
NanXiao Mar 15, 2021
1d01054
QUIC: Fix CI (#20)
tmshort Mar 18, 2021
26559c2
QUIC: Break up header/body processing
tmshort May 6, 2021
e1cbdd8
QUIC: Fix make doc-nits
tmshort Jun 24, 2021
7e27ac1
QUIC: Fix make md-nits
tmshort Jun 24, 2021
686f010
QUIC: Check for FIPS checksum changes
tmshort Jul 9, 2021
20a99ea
QUIC: Don't muck with FIPS checksums
tmshort Jul 9, 2021
3712332
QUIC: README.md fixups
tmshort Jul 29, 2021
ebc55f9
QUIC: Update RFC references
tmshort Sep 7, 2021
4c14c90
QUIC: revert white-space change
tmshort Sep 7, 2021
1cd3382
QUIC: update copyrights
tmshort Sep 7, 2021
f62f606
QUIC: update SSL_provide_quic_data() documentation
kaduk Sep 7, 2021
2f0148a
QUIC: expound on what DoS attacks QUIC avoids
kaduk Sep 7, 2021
a1f7e27
QUIC: remove SSL_get_current_cipher() reference
kaduk Sep 7, 2021
61fc9bd
QUIC: use SSL_IS_QUIC() in more places
kaduk Sep 7, 2021
6261753
QUIC: Error when non-empty session_id in CH (fixes #29)
tmshort Oct 18, 2021
ec3234f
QUIC: Update SSL_clear() to clear quic data
tmshort Oct 19, 2021
9c2778f
QUIC: Better SSL_clear()
tmshort Oct 29, 2021
eb81070
QUIC: Update README
tmshort Nov 2, 2021
7040876
QUIC: Update README.md for 3.0.7
tmshort Mar 15, 2022
08e7fe0
QUIC: Fix extension test
tmshort Nov 1, 2022
0a71fa3
QUIC: Update README.md for 3.0.8
tmshort Feb 7, 2023
10c0b02
QUIC: Update README.md for 3.1.0
wbl Mar 20, 2023
f4585d3
QUIC: Update README.md for 3.1.2
tmshort Aug 1, 2023
60ffce5
QUIC: Fix use of create_a_psk
tmshort Aug 1, 2023
53bfec7
QUIC: Update MD files for 3.1.5
tmshort Oct 6, 2023
82ed0f1
QUIC: Update readme for 3.1.6
tmshort Aug 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/fips-checksums.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,29 @@ jobs:
with:
name: fips_checksum
path: artifact/
verify-checksums:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is busted and we don't care, should we remove it?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this seems to have worked?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still failed, but it's something we can look at: removing some of these CI actions.

runs-on: ubuntu-latest
steps:
- name: install unifdef
run: |
sudo apt-get update
sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install unifdef
- uses: actions/checkout@v2
- name: create build dirs
run: |
mkdir ./build
- name: config
run: ../config enable-fips && perl configdata.pm --dump
working-directory: ./build
- name: make build_generated
run: make -s build_generated
working-directory: ./build
- name: make fips-checksums
run: make fips-checksums
working-directory: ./build
- name: make fips-checksums
run: make fips-checksums
working-directory: ./build
- name: make diff-fips-checksums
run: make diff-fips-checksums
working-directory: ./build
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ OpenSSL Releases
OpenSSL 3.1
-----------

### Changes between 3.1.6 and 3.1.6+quic [4 Jun 2024]

* Add QUIC API support from BoringSSL.

*Todd Short*

### Changes between 3.1.5 and 3.1.6 [4 Jun 2024]

* Fixed potential use after free after SSL_free_buffers() is called.
Expand Down
5 changes: 4 additions & 1 deletion Configure
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ my @disablables = (
"poly1305",
"posix-io",
"psk",
"quic",
"rc2",
"rc4",
"rc5",
Expand Down Expand Up @@ -578,14 +579,15 @@ my @disable_cascades = (
"sm3", "sm4", "srp",
"srtp", "ssl3-method", "ssl-trace",
"ts", "ui-console", "whirlpool",
"quic",
"fips-securitychecks" ],
sub { $config{processor} eq "386" }
=> [ "sse2" ],
"ssl" => [ "ssl3" ],
"ssl3-method" => [ "ssl3" ],
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost" ],
"ec" => [ "ec2m", "ecdsa", "ecdh", "sm2", "gost", "quic" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
Expand Down Expand Up @@ -636,6 +638,7 @@ my @disable_cascades = (
"legacy" => [ "md2" ],

"cmp" => [ "crmf" ],
"tls1_3" => [ "quic" ],

"fips" => [ "fips-securitychecks", "acvp-tests" ],

Expand Down
4 changes: 4 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,10 @@ Don't use POSIX IO capabilities.

Don't build support for Pre-Shared Key based ciphersuites.

### no-quic

Don't build support for QUIC API from BoringSSL.

### no-rdrand

Don't use hardware RDRAND capabilities.
Expand Down
224 changes: 224 additions & 0 deletions README-OpenSSL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
Welcome to the OpenSSL Project
==============================

[![openssl logo]][www.openssl.org]

[![github actions ci badge]][github actions ci]
[![appveyor badge]][appveyor jobs]

OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit
for the Transport Layer Security (TLS) protocol formerly known as the
Secure Sockets Layer (SSL) protocol. The protocol implementation is based
on a full-strength general purpose cryptographic library, which can also
be used stand-alone.

OpenSSL is descended from the SSLeay library developed by Eric A. Young
and Tim J. Hudson.

The official Home Page of the OpenSSL Project is [www.openssl.org].

Table of Contents
=================

- [Overview](#overview)
- [Download](#download)
- [Build and Install](#build-and-install)
- [Documentation](#documentation)
- [License](#license)
- [Support](#support)
- [Contributing](#contributing)
- [Legalities](#legalities)

Overview
========

The OpenSSL toolkit includes:

- **libssl**
an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]).

- **libcrypto**
a full-strength general purpose cryptographic library. It constitutes the
basis of the TLS implementation, but can also be used independently.

- **openssl**
the OpenSSL command line tool, a swiss army knife for cryptographic tasks,
testing and analyzing. It can be used for
- creation of key parameters
- creation of X.509 certificates, CSRs and CRLs
- calculation of message digests
- encryption and decryption
- SSL/TLS client and server tests
- handling of S/MIME signed or encrypted mail
- and more...

Download
========

For Production Use
------------------

Source code tarballs of the official releases can be downloaded from
[www.openssl.org/source](https://www.openssl.org/source).
The OpenSSL project does not distribute the toolkit in binary form.

However, for a large variety of operating systems precompiled versions
of the OpenSSL toolkit are available. In particular, on Linux and other
Unix operating systems, it is normally recommended to link against the
precompiled shared libraries provided by the distributor or vendor.

For Testing and Development
---------------------------

Although testing and development could in theory also be done using
the source tarballs, having a local copy of the git repository with
the entire project history gives you much more insight into the
code base.

The official OpenSSL Git Repository is located at [git.openssl.org].
There is a GitHub mirror of the repository at [github.com/openssl/openssl],
which is updated automatically from the former on every commit.

A local copy of the Git Repository can be obtained by cloning it from
the original OpenSSL repository using

git clone git://git.openssl.org/openssl.git

or from the GitHub mirror using

git clone https://github.com/openssl/openssl.git

If you intend to contribute to OpenSSL, either to fix bugs or contribute
new features, you need to fork the OpenSSL repository openssl/openssl on
GitHub and clone your public fork instead.

git clone https://github.com/yourname/openssl.git

This is necessary because all development of OpenSSL nowadays is done via
GitHub pull requests. For more details, see [Contributing](#contributing).

Build and Install
=================

After obtaining the Source, have a look at the [INSTALL](INSTALL.md) file for
detailed instructions about building and installing OpenSSL. For some
platforms, the installation instructions are amended by a platform specific
document.

* [Notes for UNIX-like platforms](NOTES-UNIX.md)
* [Notes for Android platforms](NOTES-ANDROID.md)
* [Notes for Windows platforms](NOTES-WINDOWS.md)
* [Notes for the DOS platform with DJGPP](NOTES-DJGPP.md)
* [Notes for the OpenVMS platform](NOTES-VMS.md)
* [Notes on Perl](NOTES-PERL.md)
* [Notes on Valgrind](NOTES-VALGRIND.md)

Specific notes on upgrading to OpenSSL 3.0 from previous versions can be found
in the [migration_guide(7ossl)] manual page.

Documentation
=============

Manual Pages
------------

The manual pages for the master branch and all current stable releases are
available online.

- [OpenSSL master](https://www.openssl.org/docs/manmaster)
- [OpenSSL 3.0](https://www.openssl.org/docs/man3.0)
- [OpenSSL 1.1.1](https://www.openssl.org/docs/man1.1.1)

Wiki
----

There is a Wiki at [wiki.openssl.org] which is currently not very active.
It contains a lot of useful information, not all of which is up-to-date.

License
=======

OpenSSL is licensed under the Apache License 2.0, which means that
you are free to get and use it for commercial and non-commercial
purposes as long as you fulfill its conditions.

See the [LICENSE.txt](LICENSE.txt) file for more details.

Support
=======

There are various ways to get in touch. The correct channel depends on
your requirement. See the [SUPPORT](SUPPORT.md) file for more details.

Contributing
============

If you are interested and willing to contribute to the OpenSSL project,
please take a look at the [CONTRIBUTING](CONTRIBUTING.md) file.

Legalities
==========

A number of nations restrict the use or export of cryptography. If you are
potentially subject to such restrictions, you should seek legal advice before
attempting to develop or distribute cryptographic code.

Copyright
=========

Copyright (c) 1998-2024 The OpenSSL Project

Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

All rights reserved.

<!-- Links -->

[www.openssl.org]:
<https://www.openssl.org>
"OpenSSL Homepage"

[git.openssl.org]:
<https://git.openssl.org>
"OpenSSL Git Repository"

[git.openssl.org]:
<https://git.openssl.org>
"OpenSSL Git Repository"

[github.com/openssl/openssl]:
<https://github.com/openssl/openssl>
"OpenSSL GitHub Mirror"

[wiki.openssl.org]:
<https://wiki.openssl.org>
"OpenSSL Wiki"

[migration_guide(7ossl)]:
<https://www.openssl.org/docs/man3.0/man7/migration_guide.html>
"OpenSSL Migration Guide"

[RFC 8446]:
<https://tools.ietf.org/html/rfc8446>

<!-- Logos and Badges -->

[openssl logo]:
doc/images/openssl.svg
"OpenSSL Logo"

[github actions ci badge]:
<https://github.com/openssl/openssl/workflows/GitHub%20CI/badge.svg>
"GitHub Actions CI Status"

[github actions ci]:
<https://github.com/openssl/openssl/actions?query=workflow%3A%22GitHub+CI%22>
"GitHub Actions CI"

[appveyor badge]:
<https://ci.appveyor.com/api/projects/status/8e10o7xfrg73v98f/branch/master?svg=true>
"AppVeyor Build Status"

[appveyor jobs]:
<https://ci.appveyor.com/project/openssl/openssl/branch/master>
"AppVeyor Jobs"
Loading
Loading