diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | fc7396568e61a510b9336d6c220aaa889c03060f (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/evp/evp_test.c | |
| parent | 1e8701dd2507fadf6d232d93eb4299a8b79c66d5 (diff) | |
| download | openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.gz openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.bz2 openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/evp/evp_test.c')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c index 902efac975..55c7cdfdcc 100644 --- a/src/lib/libcrypto/evp/evp_test.c +++ b/src/lib/libcrypto/evp/evp_test.c | |||
| @@ -435,6 +435,7 @@ int main(int argc,char **argv) | |||
| 435 | EXIT(3); | 435 | EXIT(3); |
| 436 | } | 436 | } |
| 437 | } | 437 | } |
| 438 | fclose(f); | ||
| 438 | 439 | ||
| 439 | #ifndef OPENSSL_NO_ENGINE | 440 | #ifndef OPENSSL_NO_ENGINE |
| 440 | ENGINE_cleanup(); | 441 | ENGINE_cleanup(); |