diff options
Diffstat (limited to 'src/lib/libcrypto/conf/conf_def.c')
-rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index c437aeb457..e608e5fe9d 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: conf_def.c,v 1.28 2014/07/11 15:38:03 miod Exp $ */ | 1 | /* $OpenBSD: conf_def.c,v 1.29 2015/02/07 13:19:15 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -388,27 +388,12 @@ again: | |||
388 | } | 388 | } |
389 | } else | 389 | } else |
390 | tv = sv; | 390 | tv = sv; |
391 | #if 1 | 391 | |
392 | if (_CONF_add_string(conf, tv, v) == 0) { | 392 | if (_CONF_add_string(conf, tv, v) == 0) { |
393 | CONFerr(CONF_F_DEF_LOAD_BIO, | 393 | CONFerr(CONF_F_DEF_LOAD_BIO, |
394 | ERR_R_MALLOC_FAILURE); | 394 | ERR_R_MALLOC_FAILURE); |
395 | goto err; | 395 | goto err; |
396 | } | 396 | } |
397 | #else | ||
398 | v->section = tv->section; | ||
399 | if (!sk_CONF_VALUE_push(ts, v)) { | ||
400 | CONFerr(CONF_F_DEF_LOAD_BIO, | ||
401 | ERR_R_MALLOC_FAILURE); | ||
402 | goto err; | ||
403 | } | ||
404 | vv = (CONF_VALUE *)lh_insert(conf->data, v); | ||
405 | if (vv != NULL) { | ||
406 | sk_CONF_VALUE_delete_ptr(ts, vv); | ||
407 | free(vv->name); | ||
408 | free(vv->value); | ||
409 | free(vv); | ||
410 | } | ||
411 | #endif | ||
412 | v = NULL; | 397 | v = NULL; |
413 | } | 398 | } |
414 | } | 399 | } |