diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-31 15:25:23 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-31 15:25:23 +0000 |
| commit | b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342 (patch) | |
| tree | 2a7386571f7a820ff0830927575980b68bb350c7 /include | |
| parent | aa144ced5d61b5c7fb74acaebb37d85bd08f0416 (diff) | |
| download | src-b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342.tar.gz src-b6cfecdc04a5a5e42ae4f2b025d8246cc16f3342.zip | |
Import OpenSSL 1.1.1f.vendor/openssl/1.1.1f
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=359482
svn path=/vendor-crypto/openssl/1.1.1f/; revision=359483; tag=vendor/openssl/1.1.1f
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/opensslv.h | 6 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index dd8ef3df722f..8c697f5f7acc 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -1,5 +1,5 @@ /* - * Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1999-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 @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x1010105fL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1e 17 Mar 2020" +# define OPENSSL_VERSION_NUMBER 0x1010106fL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1f 31 Mar 2020" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 0ef684f3c131..82983d3c1e99 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -734,7 +734,6 @@ int ERR_load_SSL_strings(void); # define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243 # define SSL_R_UNEXPECTED_CCS_MESSAGE 262 # define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178 -# define SSL_R_UNEXPECTED_EOF_WHILE_READING 294 # define SSL_R_UNEXPECTED_MESSAGE 244 # define SSL_R_UNEXPECTED_RECORD 245 # define SSL_R_UNINITIALIZED 276 |