diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/engine/hw_aep.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/engine/hw_aep.c')
| -rw-r--r-- | src/lib/libcrypto/engine/hw_aep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/engine/hw_aep.c b/src/lib/libcrypto/engine/hw_aep.c index 8b8380a582..5f1772ea99 100644 --- a/src/lib/libcrypto/engine/hw_aep.c +++ b/src/lib/libcrypto/engine/hw_aep.c | |||
| @@ -474,6 +474,7 @@ static int aep_init(ENGINE *e) | |||
| 474 | 474 | ||
| 475 | if(aep_dso) | 475 | if(aep_dso) |
| 476 | DSO_free(aep_dso); | 476 | DSO_free(aep_dso); |
| 477 | aep_dso = NULL; | ||
| 477 | 478 | ||
| 478 | p_AEP_OpenConnection = NULL; | 479 | p_AEP_OpenConnection = NULL; |
| 479 | p_AEP_ModExp = NULL; | 480 | p_AEP_ModExp = NULL; |