diff options
| author | tb <> | 2021-10-24 13:51:07 +0000 |
|---|---|---|
| committer | tb <> | 2021-10-24 13:51:07 +0000 |
| commit | 9ce34ff028d65fd9aa89304d29caccdc79b5d1e4 (patch) | |
| tree | a42844d28ec778496b905aec60600eac4ccf47e8 | |
| parent | f731efcb020de1a829fe2e6ba79f1411545dbdbf (diff) | |
| download | openbsd-9ce34ff028d65fd9aa89304d29caccdc79b5d1e4.tar.gz openbsd-9ce34ff028d65fd9aa89304d29caccdc79b5d1e4.tar.bz2 openbsd-9ce34ff028d65fd9aa89304d29caccdc79b5d1e4.zip | |
Prepare to provide EVP_MD_CTX_get_md_data()
ok beck jsing
| -rw-r--r-- | src/lib/libcrypto/evp/evp.h | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/evp_lib.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 06c529ef3f..4e32a794b4 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.83 2021/05/10 17:00:32 tb Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.84 2021/10/24 13:51:07 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -486,6 +486,9 @@ int EVP_MD_block_size(const EVP_MD *md); | |||
| 486 | unsigned long EVP_MD_flags(const EVP_MD *md); | 486 | unsigned long EVP_MD_flags(const EVP_MD *md); |
| 487 | 487 | ||
| 488 | const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx); | 488 | const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx); |
| 489 | #if defined(LIBRESSL_NEW_API) | ||
| 490 | void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx); | ||
| 491 | #endif | ||
| 489 | #define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e)) | 492 | #define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e)) |
| 490 | #define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e)) | 493 | #define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e)) |
| 491 | #define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e)) | 494 | #define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e)) |
diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c index 90107739e7..83b81bd429 100644 --- a/src/lib/libcrypto/evp/evp_lib.c +++ b/src/lib/libcrypto/evp/evp_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_lib.c,v 1.17 2018/09/12 06:35:38 djm Exp $ */ | 1 | /* $OpenBSD: evp_lib.c,v 1.18 2021/10/24 13:51:07 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -353,6 +353,12 @@ EVP_MD_CTX_md(const EVP_MD_CTX *ctx) | |||
| 353 | return ctx->digest; | 353 | return ctx->digest; |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | void * | ||
| 357 | EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx) | ||
| 358 | { | ||
| 359 | return ctx->md_data; | ||
| 360 | } | ||
| 361 | |||
| 356 | void | 362 | void |
| 357 | EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags) | 363 | EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags) |
| 358 | { | 364 | { |
