summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts
diff options
context:
space:
mode:
authorreyk <>2014-04-14 09:36:26 +0000
committerreyk <>2014-04-14 09:36:26 +0000
commite644cfa286282f1be26241bb1e862d985d38820b (patch)
tree6bc2631d25ee7ca72133bc5fee3867f226a423d7 /src/lib/libcrypto/ts
parent8db6bc9c33d85a7fb79ed35c3e698afb084dd5b4 (diff)
downloadopenbsd-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/ts')
-rw-r--r--src/lib/libcrypto/ts/ts_conf.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index c39be76f28..212f8bf702 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -217,9 +217,6 @@ int TS_CONF_set_default_engine(const char *name)
217 if (strcmp(name, "builtin") == 0) return 1; 217 if (strcmp(name, "builtin") == 0) return 1;
218 218
219 if (!(e = ENGINE_by_id(name))) goto err; 219 if (!(e = ENGINE_by_id(name))) goto err;
220 /* Enable the use of the NCipher HSM for forked children. */
221 if (strcmp(name, "chil") == 0)
222 ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
223 /* All the operations are going to be carried out by the engine. */ 220 /* All the operations are going to be carried out by the engine. */
224 if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) goto err; 221 if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) goto err;
225 ret = 1; 222 ret = 1;