diff options
| author | tb <> | 2023-12-29 07:22:47 +0000 | 
|---|---|---|
| committer | tb <> | 2023-12-29 07:22:47 +0000 | 
| commit | 290b2556a46fdf4db11544123a9f095ed17d6e22 (patch) | |
| tree | 580ebc14b37d2e8a52781581267fd9133f5d0fe0 /src/lib/libc | |
| parent | 0523322302fbb4c568b70aa19f3f3012143af56a (diff) | |
| download | openbsd-290b2556a46fdf4db11544123a9f095ed17d6e22.tar.gz openbsd-290b2556a46fdf4db11544123a9f095ed17d6e22.tar.bz2 openbsd-290b2556a46fdf4db11544123a9f095ed17d6e22.zip | |
Move the EVP_MD block size accessor down
This way all the EVP_MD accessors are in the order of the struct fields.
Well, arguably the EVP_MD_meth* should come first, but they are scheduled
to go meet the dodo.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_digest.c | 18 | 
1 files changed, 11 insertions, 7 deletions
| diff --git a/src/lib/libcrypto/evp/evp_digest.c b/src/lib/libcrypto/evp/evp_digest.c index 0f99cba268..166b045625 100644 --- a/src/lib/libcrypto/evp/evp_digest.c +++ b/src/lib/libcrypto/evp/evp_digest.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_digest.c,v 1.6 2023/12/29 07:14:02 tb Exp $ */ | 1 | /* $OpenBSD: evp_digest.c,v 1.7 2023/12/29 07:22:47 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 | * | 
| @@ -430,12 +430,6 @@ EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx) | |||
| 430 | } | 430 | } | 
| 431 | 431 | ||
| 432 | int | 432 | int | 
| 433 | EVP_MD_block_size(const EVP_MD *md) | ||
| 434 | { | ||
| 435 | return md->block_size; | ||
| 436 | } | ||
| 437 | |||
| 438 | int | ||
| 439 | EVP_MD_type(const EVP_MD *md) | 433 | EVP_MD_type(const EVP_MD *md) | 
| 440 | { | 434 | { | 
| 441 | return md->type; | 435 | return md->type; | 
| @@ -463,6 +457,16 @@ EVP_MD_flags(const EVP_MD *md) | |||
| 463 | return md->flags; | 457 | return md->flags; | 
| 464 | } | 458 | } | 
| 465 | 459 | ||
| 460 | int | ||
| 461 | EVP_MD_block_size(const EVP_MD *md) | ||
| 462 | { | ||
| 463 | return md->block_size; | ||
| 464 | } | ||
| 465 | |||
| 466 | /* | ||
| 467 | * XXX - remove everything below in the next bump. | ||
| 468 | */ | ||
| 469 | |||
| 466 | EVP_MD * | 470 | EVP_MD * | 
| 467 | EVP_MD_meth_new(int md_type, int pkey_type) | 471 | EVP_MD_meth_new(int md_type, int pkey_type) | 
| 468 | { | 472 | { | 
