diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/dh/dh_ameth.c | 18 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_prn.c | 17 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c index a0bcf8a761..f1e15762a1 100644 --- a/src/lib/libcrypto/dh/dh_ameth.c +++ b/src/lib/libcrypto/dh/dh_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dh_ameth.c,v 1.26 2022/12/26 07:18:51 jmc Exp $ */ | 1 | /* $OpenBSD: dh_ameth.c,v 1.27 2023/04/17 05:51:16 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -474,6 +474,22 @@ DHparams_print(BIO *bp, const DH *x) | |||
| 474 | return do_dh_print(bp, x, 4, NULL, 0); | 474 | return do_dh_print(bp, x, 4, NULL, 0); |
| 475 | } | 475 | } |
| 476 | 476 | ||
| 477 | int | ||
| 478 | DHparams_print_fp(FILE *fp, const DH *x) | ||
| 479 | { | ||
| 480 | BIO *b; | ||
| 481 | int ret; | ||
| 482 | |||
| 483 | if ((b = BIO_new(BIO_s_file())) == NULL) { | ||
| 484 | DHerror(ERR_R_BUF_LIB); | ||
| 485 | return 0; | ||
| 486 | } | ||
| 487 | BIO_set_fp(b,fp,BIO_NOCLOSE); | ||
| 488 | ret = DHparams_print(b, x); | ||
| 489 | BIO_free(b); | ||
| 490 | return ret; | ||
| 491 | } | ||
| 492 | |||
| 477 | static int | 493 | static int |
| 478 | dh_pkey_public_check(const EVP_PKEY *pkey) | 494 | dh_pkey_public_check(const EVP_PKEY *pkey) |
| 479 | { | 495 | { |
diff --git a/src/lib/libcrypto/dh/dh_prn.c b/src/lib/libcrypto/dh/dh_prn.c index 56a96f8631..2c6d17938b 100644 --- a/src/lib/libcrypto/dh/dh_prn.c +++ b/src/lib/libcrypto/dh/dh_prn.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dh_prn.c,v 1.6 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: dh_prn.c,v 1.7 2023/04/17 05:51:16 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 | * |
| @@ -62,18 +62,3 @@ | |||
| 62 | #include <openssl/err.h> | 62 | #include <openssl/err.h> |
| 63 | #include <openssl/evp.h> | 63 | #include <openssl/evp.h> |
| 64 | 64 | ||
| 65 | int | ||
| 66 | DHparams_print_fp(FILE *fp, const DH *x) | ||
| 67 | { | ||
| 68 | BIO *b; | ||
| 69 | int ret; | ||
| 70 | |||
| 71 | if ((b = BIO_new(BIO_s_file())) == NULL) { | ||
| 72 | DHerror(ERR_R_BUF_LIB); | ||
| 73 | return 0; | ||
| 74 | } | ||
| 75 | BIO_set_fp(b,fp,BIO_NOCLOSE); | ||
| 76 | ret = DHparams_print(b, x); | ||
| 77 | BIO_free(b); | ||
| 78 | return ret; | ||
| 79 | } | ||
