mirror of
https://github.com/opnsense/src.git
synced 2026-06-07 15:52:40 -04:00
Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz Differential Revision: https://reviews.freebsd.org/D38835 Test Plan: ``` $ git status On branch vendor/openssl-3.0 nothing to commit, working tree clean $ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.8 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/ngie/.gnupg/pubring.kbx ----------------------------- pub rsa4096 2014-10-04 [SC] 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C uid [ unknown] Richard Levitte <richard@levitte.org> uid [ unknown] Richard Levitte <levitte@lp.se> uid [ unknown] Richard Levitte <levitte@openssl.org> sub rsa4096 2014-10-04 [E] $ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Feb 7 05:43:55 2023 PST gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown] gpg: aka "Richard Levitte <levitte@lp.se>" [unknown] gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C $ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old) On branch vendor/openssl-3.0 nothing to commit, working tree clean $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . $ cat .git gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout $ diff -arq ../openssl-3.0.8 . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 nothing to commit, working tree clean $ ``` Reviewers: emaste, jkim Subscribers: imp, andrew, dab Differential Revision: https://reviews.freebsd.org/D38835
110 lines
3.2 KiB
C
110 lines
3.2 KiB
C
/*
|
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "ssl_local.h"
|
|
|
|
int ssl3_do_change_cipher_spec(SSL *s)
|
|
{
|
|
int i;
|
|
|
|
if (s->server)
|
|
i = SSL3_CHANGE_CIPHER_SERVER_READ;
|
|
else
|
|
i = SSL3_CHANGE_CIPHER_CLIENT_READ;
|
|
|
|
if (s->s3.tmp.key_block == NULL) {
|
|
if (s->session == NULL || s->session->master_key_length == 0) {
|
|
/* might happen if dtls1_read_bytes() calls this */
|
|
ERR_raise(ERR_LIB_SSL, SSL_R_CCS_RECEIVED_EARLY);
|
|
return 0;
|
|
}
|
|
|
|
s->session->cipher = s->s3.tmp.new_cipher;
|
|
if (!s->method->ssl3_enc->setup_key_block(s)) {
|
|
/* SSLfatal() already called */
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if (!s->method->ssl3_enc->change_cipher_state(s, i)) {
|
|
/* SSLfatal() already called */
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
int ssl3_send_alert(SSL *s, int level, int desc)
|
|
{
|
|
/* Map tls/ssl alert value to correct one */
|
|
if (SSL_TREAT_AS_TLS13(s))
|
|
desc = tls13_alert_code(desc);
|
|
else
|
|
desc = s->method->ssl3_enc->alert_value(desc);
|
|
if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION)
|
|
desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have
|
|
* protocol_version alerts */
|
|
if (desc < 0)
|
|
return -1;
|
|
if (s->shutdown & SSL_SENT_SHUTDOWN && desc != SSL_AD_CLOSE_NOTIFY)
|
|
return -1;
|
|
/* If a fatal one, remove from cache */
|
|
if ((level == SSL3_AL_FATAL) && (s->session != NULL))
|
|
SSL_CTX_remove_session(s->session_ctx, s->session);
|
|
|
|
s->s3.alert_dispatch = 1;
|
|
s->s3.send_alert[0] = level;
|
|
s->s3.send_alert[1] = desc;
|
|
if (!RECORD_LAYER_write_pending(&s->rlayer)) {
|
|
/* data still being written out? */
|
|
return s->method->ssl_dispatch_alert(s);
|
|
}
|
|
/*
|
|
* else data is still being written out, we will get written some time in
|
|
* the future
|
|
*/
|
|
return -1;
|
|
}
|
|
|
|
int ssl3_dispatch_alert(SSL *s)
|
|
{
|
|
int i, j;
|
|
size_t alertlen;
|
|
void (*cb) (const SSL *ssl, int type, int val) = NULL;
|
|
size_t written;
|
|
|
|
s->s3.alert_dispatch = 0;
|
|
alertlen = 2;
|
|
i = do_ssl3_write(s, SSL3_RT_ALERT, &s->s3.send_alert[0], &alertlen, 1, 0,
|
|
&written);
|
|
if (i <= 0) {
|
|
s->s3.alert_dispatch = 1;
|
|
} else {
|
|
/*
|
|
* Alert sent to BIO - now flush. If the message does not get sent due
|
|
* to non-blocking IO, we will not worry too much.
|
|
*/
|
|
(void)BIO_flush(s->wbio);
|
|
|
|
if (s->msg_callback)
|
|
s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3.send_alert,
|
|
2, s, s->msg_callback_arg);
|
|
|
|
if (s->info_callback != NULL)
|
|
cb = s->info_callback;
|
|
else if (s->ctx->info_callback != NULL)
|
|
cb = s->ctx->info_callback;
|
|
|
|
if (cb != NULL) {
|
|
j = (s->s3.send_alert[0] << 8) | s->s3.send_alert[1];
|
|
cb(s, SSL_CB_WRITE_ALERT, j);
|
|
}
|
|
}
|
|
return i;
|
|
}
|