diff options
| author | reyk <> | 2014-04-14 09:36:26 +0000 | 
|---|---|---|
| committer | reyk <> | 2014-04-14 09:36:26 +0000 | 
| commit | e644cfa286282f1be26241bb1e862d985d38820b (patch) | |
| tree | 6bc2631d25ee7ca72133bc5fee3867f226a423d7 /src/lib/libcrypto/engine/engine.h | |
| parent | 8db6bc9c33d85a7fb79ed35c3e698afb084dd5b4 (diff) | |
| download | openbsd-e644cfa286282f1be26241bb1e862d985d38820b.tar.gz openbsd-e644cfa286282f1be26241bb1e862d985d38820b.tar.bz2 openbsd-e644cfa286282f1be26241bb1e862d985d38820b.zip | |
Remove the nCipher CHIL engine.  It is not standalone and depends on
external libraries that aren't covered by the same license.
Diffstat (limited to 'src/lib/libcrypto/engine/engine.h')
| -rw-r--r-- | src/lib/libcrypto/engine/engine.h | 17 | 
1 files changed, 0 insertions, 17 deletions
| diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index e9478dd12f..a2b7e83a66 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
| @@ -246,22 +246,6 @@ extern "C" { | |||
| 246 | * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */ | 246 | * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */ | 
| 247 | #define ENGINE_CMD_BASE 200 | 247 | #define ENGINE_CMD_BASE 200 | 
| 248 | 248 | ||
| 249 | /* NB: These 2 nCipher "chil" control commands are deprecated, and their | ||
| 250 | * functionality is now available through ENGINE-specific control commands | ||
| 251 | * (exposed through the above-mentioned 'CMD'-handling). Code using these 2 | ||
| 252 | * commands should be migrated to the more general command handling before these | ||
| 253 | * are removed. */ | ||
| 254 | |||
| 255 | /* Flags specific to the nCipher "chil" engine */ | ||
| 256 | #define ENGINE_CTRL_CHIL_SET_FORKCHECK 100 | ||
| 257 | /* Depending on the value of the (long)i argument, this sets or | ||
| 258 | * unsets the SimpleForkCheck flag in the CHIL API to enable or | ||
| 259 | * disable checking and workarounds for applications that fork(). | ||
| 260 | */ | ||
| 261 | #define ENGINE_CTRL_CHIL_NO_LOCKING 101 | ||
| 262 | /* This prevents the initialisation function from providing mutex | ||
| 263 | * callbacks to the nCipher library. */ | ||
| 264 | |||
| 265 | /* If an ENGINE supports its own specific control commands and wishes the | 249 | /* If an ENGINE supports its own specific control commands and wishes the | 
| 266 | * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its | 250 | * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its | 
| 267 | * behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN entries | 251 | * behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN entries | 
| @@ -332,7 +316,6 @@ ENGINE *ENGINE_by_id(const char *id); | |||
| 332 | void ENGINE_load_openssl(void); | 316 | void ENGINE_load_openssl(void); | 
| 333 | void ENGINE_load_dynamic(void); | 317 | void ENGINE_load_dynamic(void); | 
| 334 | #ifndef OPENSSL_NO_STATIC_ENGINE | 318 | #ifndef OPENSSL_NO_STATIC_ENGINE | 
| 335 | void ENGINE_load_chil(void); | ||
| 336 | void ENGINE_load_nuron(void); | 319 | void ENGINE_load_nuron(void); | 
| 337 | void ENGINE_load_padlock(void); | 320 | void ENGINE_load_padlock(void); | 
| 338 | void ENGINE_load_capi(void); | 321 | void ENGINE_load_capi(void); | 
