diff options
| author | tb <> | 2023-11-19 15:46:10 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-19 15:46:10 +0000 |
| commit | 593d97e74cc873d99aced677883cf55625efe62d (patch) | |
| tree | 9a8bf5329015d40f6a79820880c1ca7bb820bf58 /src/lib/libcrypto/asn1/a_pkey.c | |
| parent | cde35b41c5eb9d9d0b61fe730c39e6a5c553b840 (diff) | |
| download | openbsd-593d97e74cc873d99aced677883cf55625efe62d.tar.gz openbsd-593d97e74cc873d99aced677883cf55625efe62d.tar.bz2 openbsd-593d97e74cc873d99aced677883cf55625efe62d.zip | |
Unifdef OPENSSL_NO_ENGINE in libcrypto
This is mechanical apart from a few manual edits to avoid doubled empty
lines.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/asn1/a_pkey.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/a_pkey.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/asn1/a_pkey.c b/src/lib/libcrypto/asn1/a_pkey.c index 6e715d4f9e..1e8ebc913f 100644 --- a/src/lib/libcrypto/asn1/a_pkey.c +++ b/src/lib/libcrypto/asn1/a_pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: a_pkey.c,v 1.6 2023/07/07 19:37:52 beck Exp $ */ | 1 | /* $OpenBSD: a_pkey.c,v 1.7 2023/11/19 15:46:09 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 | * |
| @@ -67,10 +67,6 @@ | |||
| 67 | #include <openssl/objects.h> | 67 | #include <openssl/objects.h> |
| 68 | #include <openssl/x509.h> | 68 | #include <openssl/x509.h> |
| 69 | 69 | ||
| 70 | #ifndef OPENSSL_NO_ENGINE | ||
| 71 | #include <openssl/engine.h> | ||
| 72 | #endif | ||
| 73 | |||
| 74 | #include "asn1_local.h" | 70 | #include "asn1_local.h" |
| 75 | #include "evp_local.h" | 71 | #include "evp_local.h" |
| 76 | 72 | ||
| @@ -87,10 +83,6 @@ d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length) | |||
| 87 | } | 83 | } |
| 88 | } else { | 84 | } else { |
| 89 | ret = *a; | 85 | ret = *a; |
| 90 | #ifndef OPENSSL_NO_ENGINE | ||
| 91 | ENGINE_finish(ret->engine); | ||
| 92 | ret->engine = NULL; | ||
| 93 | #endif | ||
| 94 | } | 86 | } |
| 95 | 87 | ||
| 96 | if (!EVP_PKEY_set_type(ret, type)) { | 88 | if (!EVP_PKEY_set_type(ret, type)) { |
