diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/s_cb.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/usr.bin/openssl/s_cb.c b/src/usr.bin/openssl/s_cb.c index 3a0c89bb7a..8c8e2c23ba 100644 --- a/src/usr.bin/openssl/s_cb.c +++ b/src/usr.bin/openssl/s_cb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s_cb.c,v 1.15 2021/04/02 10:19:19 inoguchi Exp $ */ | 1 | /* $OpenBSD: s_cb.c,v 1.16 2022/02/03 17:42:54 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 | * |
| @@ -224,26 +224,6 @@ set_cert_stuff(SSL_CTX * ctx, char *cert_file, char *key_file) | |||
| 224 | ERR_print_errors(bio_err); | 224 | ERR_print_errors(bio_err); |
| 225 | return (0); | 225 | return (0); |
| 226 | } | 226 | } |
| 227 | /* | ||
| 228 | In theory this is no longer needed | ||
| 229 | ssl=SSL_new(ctx); | ||
| 230 | x509=SSL_get_certificate(ssl); | ||
| 231 | |||
| 232 | if (x509 != NULL) { | ||
| 233 | EVP_PKEY *pktmp; | ||
| 234 | pktmp = X509_get_pubkey(x509); | ||
| 235 | EVP_PKEY_copy_parameters(pktmp, | ||
| 236 | SSL_get_privatekey(ssl)); | ||
| 237 | EVP_PKEY_free(pktmp); | ||
| 238 | } | ||
| 239 | SSL_free(ssl); | ||
| 240 | */ | ||
| 241 | |||
| 242 | /* | ||
| 243 | * If we are using DSA, we can copy the parameters from the | ||
| 244 | * private key | ||
| 245 | */ | ||
| 246 | |||
| 247 | 227 | ||
| 248 | /* | 228 | /* |
| 249 | * Now we know that a key and cert have been set against the | 229 | * Now we know that a key and cert have been set against the |
