diff options
Diffstat (limited to 'src/lib/libcrypto/engine/eng_list.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_list.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c index b84504102f..78e978116a 100644 --- a/src/lib/libcrypto/engine/eng_list.c +++ b/src/lib/libcrypto/engine/eng_list.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_list.c,v 1.15 2014/07/11 08:44:48 jsing Exp $ */ | 1 | /* $OpenBSD: eng_list.c,v 1.16 2015/02/07 13:19:15 doug Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -378,14 +378,7 @@ ENGINE_by_id(const char *id) | |||
378 | } | 378 | } |
379 | } | 379 | } |
380 | CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE); | 380 | CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE); |
381 | #if 0 | 381 | |
382 | if (iterator == NULL) { | ||
383 | ENGINEerr(ENGINE_F_ENGINE_BY_ID, | ||
384 | ENGINE_R_NO_SUCH_ENGINE); | ||
385 | ERR_asprintf_error_data("id=%s", id); | ||
386 | } | ||
387 | return iterator; | ||
388 | #else | ||
389 | /* EEK! Experimental code starts */ | 382 | /* EEK! Experimental code starts */ |
390 | if (iterator) | 383 | if (iterator) |
391 | return iterator; | 384 | return iterator; |
@@ -415,7 +408,6 @@ notfound: | |||
415 | ERR_asprintf_error_data("id=%s", id); | 408 | ERR_asprintf_error_data("id=%s", id); |
416 | return NULL; | 409 | return NULL; |
417 | /* EEK! Experimental code ends */ | 410 | /* EEK! Experimental code ends */ |
418 | #endif | ||
419 | } | 411 | } |
420 | 412 | ||
421 | int | 413 | int |