-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix s_server lseek forever issue with qatprovider.
- Key management changes for X25519, X448, RSA, ECKEY PRF, ECDSA, DSA & RSA. - Fix GCM, RSA & ECDSA bug for s_server. Signed-off-by: Yuan, Shuai <[email protected]> Signed-off-by: Yogaraj Alamenda <[email protected]>
- Loading branch information
1 parent
41c67c7
commit cb3db21
Showing
16 changed files
with
1,497 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,242 @@ | ||
| #include <assert.h> | ||
| #include <openssl/core_dispatch.h> | ||
| #include <openssl/bio.h> | ||
| #include "qat_prov_bio.h" | ||
|
|
||
| static OSSL_FUNC_BIO_new_file_fn *c_bio_new_file = NULL; | ||
| static OSSL_FUNC_BIO_new_membuf_fn *c_bio_new_membuf = NULL; | ||
| static OSSL_FUNC_BIO_read_ex_fn *c_bio_read_ex = NULL; | ||
| static OSSL_FUNC_BIO_write_ex_fn *c_bio_write_ex = NULL; | ||
| static OSSL_FUNC_BIO_gets_fn *c_bio_gets = NULL; | ||
| static OSSL_FUNC_BIO_puts_fn *c_bio_puts = NULL; | ||
| static OSSL_FUNC_BIO_ctrl_fn *c_bio_ctrl = NULL; | ||
| static OSSL_FUNC_BIO_up_ref_fn *c_bio_up_ref = NULL; | ||
| static OSSL_FUNC_BIO_free_fn *c_bio_free = NULL; | ||
| static OSSL_FUNC_BIO_vprintf_fn *c_bio_vprintf = NULL; | ||
|
|
||
| int ossl_prov_bio_from_dispatch(const OSSL_DISPATCH *fns) | ||
| { | ||
| for (; fns->function_id != 0; fns++) { | ||
| switch (fns->function_id) { | ||
| case OSSL_FUNC_BIO_NEW_FILE: | ||
| if (c_bio_new_file == NULL) | ||
| c_bio_new_file = OSSL_FUNC_BIO_new_file(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_NEW_MEMBUF: | ||
| if (c_bio_new_membuf == NULL) | ||
| c_bio_new_membuf = OSSL_FUNC_BIO_new_membuf(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_READ_EX: | ||
| if (c_bio_read_ex == NULL) | ||
| c_bio_read_ex = OSSL_FUNC_BIO_read_ex(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_WRITE_EX: | ||
| if (c_bio_write_ex == NULL) | ||
| c_bio_write_ex = OSSL_FUNC_BIO_write_ex(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_GETS: | ||
| if (c_bio_gets == NULL) | ||
| c_bio_gets = OSSL_FUNC_BIO_gets(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_PUTS: | ||
| if (c_bio_puts == NULL) | ||
| c_bio_puts = OSSL_FUNC_BIO_puts(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_CTRL: | ||
| if (c_bio_ctrl == NULL) | ||
| c_bio_ctrl = OSSL_FUNC_BIO_ctrl(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_UP_REF: | ||
| if (c_bio_up_ref == NULL) | ||
| c_bio_up_ref = OSSL_FUNC_BIO_up_ref(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_FREE: | ||
| if (c_bio_free == NULL) | ||
| c_bio_free = OSSL_FUNC_BIO_free(fns); | ||
| break; | ||
| case OSSL_FUNC_BIO_VPRINTF: | ||
| if (c_bio_vprintf == NULL) | ||
| c_bio_vprintf = OSSL_FUNC_BIO_vprintf(fns); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return 1; | ||
| } | ||
|
|
||
| OSSL_CORE_BIO *ossl_prov_bio_new_file(const char *filename, const char *mode) | ||
| { | ||
| if (c_bio_new_file == NULL) | ||
| return NULL; | ||
| return c_bio_new_file(filename, mode); | ||
| } | ||
|
|
||
| OSSL_CORE_BIO *ossl_prov_bio_new_membuf(const char *filename, int len) | ||
| { | ||
| if (c_bio_new_membuf == NULL) | ||
| return NULL; | ||
| return c_bio_new_membuf(filename, len); | ||
| } | ||
|
|
||
| int ossl_prov_bio_read_ex(OSSL_CORE_BIO *bio, void *data, size_t data_len, | ||
| size_t *bytes_read) | ||
| { | ||
| if (c_bio_read_ex == NULL) | ||
| return 0; | ||
| return c_bio_read_ex(bio, data, data_len, bytes_read); | ||
| } | ||
|
|
||
| int ossl_prov_bio_write_ex(OSSL_CORE_BIO *bio, const void *data, size_t data_len, | ||
| size_t *written) | ||
| { | ||
| if (c_bio_write_ex == NULL) | ||
| return 0; | ||
| return c_bio_write_ex(bio, data, data_len, written); | ||
| } | ||
|
|
||
| int ossl_prov_bio_gets(OSSL_CORE_BIO *bio, char *buf, int size) | ||
| { | ||
| if (c_bio_gets == NULL) | ||
| return -1; | ||
| return c_bio_gets(bio, buf, size); | ||
| } | ||
|
|
||
| int ossl_prov_bio_puts(OSSL_CORE_BIO *bio, const char *str) | ||
| { | ||
| if (c_bio_puts == NULL) | ||
| return -1; | ||
| return c_bio_puts(bio, str); | ||
| } | ||
|
|
||
| int ossl_prov_bio_ctrl(OSSL_CORE_BIO *bio, int cmd, long num, void *ptr) | ||
| { | ||
| if (c_bio_ctrl == NULL) | ||
| return -1; | ||
| return c_bio_ctrl(bio, cmd, num, ptr); | ||
| } | ||
|
|
||
| int ossl_prov_bio_up_ref(OSSL_CORE_BIO *bio) | ||
| { | ||
| if (c_bio_up_ref == NULL) | ||
| return 0; | ||
| return c_bio_up_ref(bio); | ||
| } | ||
|
|
||
| int ossl_prov_bio_free(OSSL_CORE_BIO *bio) | ||
| { | ||
| if (c_bio_free == NULL) | ||
| return 0; | ||
| return c_bio_free(bio); | ||
| } | ||
|
|
||
| int ossl_prov_bio_vprintf(OSSL_CORE_BIO *bio, const char *format, va_list ap) | ||
| { | ||
| if (c_bio_vprintf == NULL) | ||
| return -1; | ||
| return c_bio_vprintf(bio, format, ap); | ||
| } | ||
|
|
||
| int ossl_prov_bio_printf(OSSL_CORE_BIO *bio, const char *format, ...) | ||
| { | ||
| va_list ap; | ||
| int ret; | ||
|
|
||
| va_start(ap, format); | ||
| ret = ossl_prov_bio_vprintf(bio, format, ap); | ||
| va_end(ap); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| #ifndef FIPS_MODULE | ||
|
|
||
| /* No direct BIO support in the FIPS module */ | ||
|
|
||
| static int bio_core_read_ex(BIO *bio, char *data, size_t data_len, | ||
| size_t *bytes_read) | ||
| { | ||
| return ossl_prov_bio_read_ex(BIO_get_data(bio), data, data_len, bytes_read); | ||
| } | ||
|
|
||
| static int bio_core_write_ex(BIO *bio, const char *data, size_t data_len, | ||
| size_t *written) | ||
| { | ||
| return ossl_prov_bio_write_ex(BIO_get_data(bio), data, data_len, written); | ||
| } | ||
|
|
||
| static long bio_core_ctrl(BIO *bio, int cmd, long num, void *ptr) | ||
| { | ||
| return ossl_prov_bio_ctrl(BIO_get_data(bio), cmd, num, ptr); | ||
| } | ||
|
|
||
| static int bio_core_gets(BIO *bio, char *buf, int size) | ||
| { | ||
| return ossl_prov_bio_gets(BIO_get_data(bio), buf, size); | ||
| } | ||
|
|
||
| static int bio_core_puts(BIO *bio, const char *str) | ||
| { | ||
| return ossl_prov_bio_puts(BIO_get_data(bio), str); | ||
| } | ||
|
|
||
| static int bio_core_new(BIO *bio) | ||
| { | ||
| BIO_set_init(bio, 1); | ||
|
|
||
| return 1; | ||
| } | ||
|
|
||
| static BIO_METHOD *ossl_prov_ctx_get0_core_bio_method(QAT_PROV_CTX *ctx) | ||
| { | ||
| if (ctx == NULL) | ||
| return NULL; | ||
| return ctx->corebiometh; | ||
| } | ||
|
|
||
| static int bio_core_free(BIO *bio) | ||
| { | ||
| BIO_set_init(bio, 0); | ||
| ossl_prov_bio_free(BIO_get_data(bio)); | ||
|
|
||
| return 1; | ||
| } | ||
|
|
||
| BIO_METHOD *ossl_bio_prov_init_bio_method(void) | ||
| { | ||
| BIO_METHOD *corebiometh = NULL; | ||
|
|
||
| corebiometh = BIO_meth_new(BIO_TYPE_CORE_TO_PROV, "BIO to Core filter"); | ||
| if (corebiometh == NULL | ||
| || !BIO_meth_set_write_ex(corebiometh, bio_core_write_ex) | ||
| || !BIO_meth_set_read_ex(corebiometh, bio_core_read_ex) | ||
| || !BIO_meth_set_puts(corebiometh, bio_core_puts) | ||
| || !BIO_meth_set_gets(corebiometh, bio_core_gets) | ||
| || !BIO_meth_set_ctrl(corebiometh, bio_core_ctrl) | ||
| || !BIO_meth_set_create(corebiometh, bio_core_new) | ||
| || !BIO_meth_set_destroy(corebiometh, bio_core_free)) { | ||
| BIO_meth_free(corebiometh); | ||
| return NULL; | ||
| } | ||
|
|
||
| return corebiometh; | ||
| } | ||
|
|
||
| BIO *ossl_bio_new_from_core_bio(QAT_PROV_CTX *provctx, OSSL_CORE_BIO *corebio) | ||
| { | ||
| BIO *outbio; | ||
| BIO_METHOD *corebiometh = ossl_prov_ctx_get0_core_bio_method(provctx); | ||
|
|
||
| if (corebiometh == NULL) | ||
| return NULL; | ||
|
|
||
| if ((outbio = BIO_new(corebiometh)) == NULL) | ||
| return NULL; | ||
| if (!ossl_prov_bio_up_ref(corebio)) { | ||
| BIO_free(outbio); | ||
| return NULL; | ||
| } | ||
| BIO_set_data(outbio, corebio); | ||
| return outbio; | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #include <stdarg.h> | ||
| #include <openssl/bio.h> | ||
| #include <openssl/core.h> | ||
| #include "qat_provider.h" | ||
|
|
||
| int ossl_prov_bio_from_dispatch(const OSSL_DISPATCH *fns); | ||
|
|
||
| OSSL_CORE_BIO *ossl_prov_bio_new_file(const char *filename, const char *mode); | ||
| OSSL_CORE_BIO *ossl_prov_bio_new_membuf(const char *filename, int len); | ||
| int ossl_prov_bio_read_ex(OSSL_CORE_BIO *bio, void *data, size_t data_len, | ||
| size_t *bytes_read); | ||
| int ossl_prov_bio_write_ex(OSSL_CORE_BIO *bio, const void *data, size_t data_len, | ||
| size_t *written); | ||
| int ossl_prov_bio_gets(OSSL_CORE_BIO *bio, char *buf, int size); | ||
| int ossl_prov_bio_puts(OSSL_CORE_BIO *bio, const char *str); | ||
| int ossl_prov_bio_ctrl(OSSL_CORE_BIO *bio, int cmd, long num, void *ptr); | ||
| int ossl_prov_bio_up_ref(OSSL_CORE_BIO *bio); | ||
| int ossl_prov_bio_free(OSSL_CORE_BIO *bio); | ||
| int ossl_prov_bio_vprintf(OSSL_CORE_BIO *bio, const char *format, va_list ap); | ||
| int ossl_prov_bio_printf(OSSL_CORE_BIO *bio, const char *format, ...); | ||
|
|
||
| BIO_METHOD *ossl_bio_prov_init_bio_method(void); | ||
| BIO *ossl_bio_new_from_core_bio(QAT_PROV_CTX *provctx, OSSL_CORE_BIO *corebio); |
Oops, something went wrong.