diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-09-22 16:18:31 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-09-22 16:18:31 +0000 |
commit | 58f351825a371d1a3dd693d6f64a1245ea851a51 (patch) | |
tree | 239e78f19bd1ceca0a1aa3b8ecedd54d2b04de00 /crypto/openssl/ssl/ssl_conf.c | |
parent | 3c0c1e01c9c55aa0ef5bec9a4612d1ce68dd76da (diff) | |
parent | 92f02b3b0f21350e7c92a16ca9b594ad7682c717 (diff) | |
download | src-test2-58f351825a371d1a3dd693d6f64a1245ea851a51.tar.gz src-test2-58f351825a371d1a3dd693d6f64a1245ea851a51.zip |
Merge OpenSSL 1.1.1h.
Notes
Notes:
svn path=/head/; revision=366004
Diffstat (limited to 'crypto/openssl/ssl/ssl_conf.c')
-rw-r--r-- | crypto/openssl/ssl/ssl_conf.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl_conf.c b/crypto/openssl/ssl/ssl_conf.c index 8ef29bb34535..0a3fef7c8c14 100644 --- a/crypto/openssl/ssl/ssl_conf.c +++ b/crypto/openssl/ssl/ssl_conf.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -305,6 +305,13 @@ static int protocol_from_string(const char *value) const char *name; int version; }; + /* + * Note: To avoid breaking previously valid configurations, we must retain + * legacy entries in this table even if the underlying protocol is no + * longer supported. This also means that the constants SSL3_VERSION, ... + * need to be retained indefinitely. This table can only grow, never + * shrink. + */ static const struct protocol_versions versions[] = { {"None", 0}, {"SSLv3", SSL3_VERSION}, |