diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-17 21:27:57 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2020-03-17 21:27:57 +0000 |
commit | aa144ced5d61b5c7fb74acaebb37d85bd08f0416 (patch) | |
tree | 2de6902cff4b007f4fae30a7d6c546b4dd3d1740 /engines | |
parent | fbc3ad1ae1976eb5f2bac351260f2c5ee255c27f (diff) | |
download | src-aa144ced5d61b5c7fb74acaebb37d85bd08f0416.tar.gz src-aa144ced5d61b5c7fb74acaebb37d85bd08f0416.zip |
Import OpenSSL 1.1.1e.vendor/openssl/1.1.1e
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=359051
svn path=/vendor-crypto/openssl/1.1.1e/; revision=359052; tag=vendor/openssl/1.1.1e
Diffstat (limited to 'engines')
-rw-r--r-- | engines/e_afalg.c | 4 | ||||
-rw-r--r-- | engines/e_afalg.h | 4 | ||||
-rw-r--r-- | engines/e_afalg_err.h | 4 | ||||
-rw-r--r-- | engines/e_capi_err.h | 4 | ||||
-rw-r--r-- | engines/e_dasync_err.h | 4 | ||||
-rw-r--r-- | engines/e_ossltest_err.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/engines/e_afalg.c b/engines/e_afalg.c index 7f62d77e5bc1..4b1722846133 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-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 @@ -456,7 +456,7 @@ static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in, /* * vmsplice and splice are used to pin the user space input buffer for - * kernel space processing avoiding copys from user to kernel space + * kernel space processing avoiding copies from user to kernel space */ ret = vmsplice(actx->zc_pipe[1], &iov, 1, SPLICE_F_GIFT); if (ret < 0) { diff --git a/engines/e_afalg.h b/engines/e_afalg.h index 2c03c448d684..3323c898c634 100644 --- a/engines/e_afalg.h +++ b/engines/e_afalg.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_AFALG_H -# define HEADER_AFALG_H +#ifndef OSSL_ENGINES_E_AFALG_H +# define OSSL_ENGINES_E_AFALG_H # if defined(__GNUC__) && __GNUC__ >= 4 && \ (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h index 3eb1332bbfe4..3036443f4470 100644 --- a/engines/e_afalg_err.h +++ b/engines/e_afalg_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_AFALGERR_H -# define HEADER_AFALGERR_H +#ifndef OSSL_ENGINES_E_AFALG_ERR_H +# define OSSL_ENGINES_E_AFALG_ERR_H # define AFALGerr(f, r) ERR_AFALG_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h index e034c98cae84..e3a927aa7339 100644 --- a/engines/e_capi_err.h +++ b/engines/e_capi_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_CAPIERR_H -# define HEADER_CAPIERR_H +#ifndef OSSL_ENGINES_E_CAPI_ERR_H +# define OSSL_ENGINES_E_CAPI_ERR_H # define CAPIerr(f, r) ERR_CAPI_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h index 7c2c0278790b..5b74d8be25f1 100644 --- a/engines/e_dasync_err.h +++ b/engines/e_dasync_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_DASYNCERR_H -# define HEADER_DASYNCERR_H +#ifndef OSSL_ENGINES_E_DASYNC_ERR_H +# define OSSL_ENGINES_E_DASYNC_ERR_H # define DASYNCerr(f, r) ERR_DASYNC_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h index e745c1a236d4..8e6535b76c08 100644 --- a/engines/e_ossltest_err.h +++ b/engines/e_ossltest_err.h @@ -8,8 +8,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_OSSLTESTERR_H -# define HEADER_OSSLTESTERR_H +#ifndef OSSL_ENGINES_E_OSSLTEST_ERR_H +# define OSSL_ENGINES_E_OSSLTEST_ERR_H # define OSSLTESTerr(f, r) ERR_OSSLTEST_error((f), (r), OPENSSL_FILE, OPENSSL_LINE) |