diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/engine/eng_fat.c | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/engine/eng_fat.c')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_fat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c index db66e62350..789b8d57e5 100644 --- a/src/lib/libcrypto/engine/eng_fat.c +++ b/src/lib/libcrypto/engine/eng_fat.c | |||
| @@ -176,6 +176,7 @@ int ENGINE_register_all_complete(void) | |||
| 176 | ENGINE *e; | 176 | ENGINE *e; |
| 177 | 177 | ||
| 178 | for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e)) | 178 | for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e)) |
| 179 | ENGINE_register_complete(e); | 179 | if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL)) |
| 180 | ENGINE_register_complete(e); | ||
| 180 | return 1; | 181 | return 1; |
| 181 | } | 182 | } |