Latest update.
This commit is contained in:
+4
-2
@@ -2690,6 +2690,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
|
||||
size_t sz = (size_t)sk_OPENSSL_STRING_num(opts);
|
||||
size_t params_n;
|
||||
char *opt = "", *stmp, *vtmp = NULL;
|
||||
int found = 1;
|
||||
|
||||
if (opts == NULL)
|
||||
return NULL;
|
||||
@@ -2708,7 +2709,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
|
||||
/* Skip over the separator so that vmtp points to the value */
|
||||
vtmp++;
|
||||
if (!OSSL_PARAM_allocate_from_text(¶ms[params_n], paramdefs,
|
||||
stmp, vtmp, strlen(vtmp)))
|
||||
stmp, vtmp, strlen(vtmp), &found))
|
||||
goto err;
|
||||
OPENSSL_free(stmp);
|
||||
}
|
||||
@@ -2716,7 +2717,8 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
|
||||
return params;
|
||||
err:
|
||||
OPENSSL_free(stmp);
|
||||
BIO_printf(bio_err, "Parameter error '%s'\n", opt);
|
||||
BIO_printf(bio_err, "Parameter %s '%s'\n", found ? "error" : "unknown",
|
||||
opt);
|
||||
ERR_print_errors(bio_err);
|
||||
app_params_free(params);
|
||||
return NULL;
|
||||
|
||||
+14
-1
@@ -1434,7 +1434,20 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
|
||||
case SSL_SECOP_OTHER_DH:
|
||||
{
|
||||
DH *dh = other;
|
||||
BIO_printf(sdb->out, "%d", DH_bits(dh));
|
||||
EVP_PKEY *pkey = EVP_PKEY_new();
|
||||
int fail = 1;
|
||||
|
||||
if (pkey != NULL) {
|
||||
if (EVP_PKEY_set1_DH(pkey, dh)) {
|
||||
BIO_printf(sdb->out, "%d", EVP_PKEY_bits(pkey));
|
||||
fail = 0;
|
||||
}
|
||||
|
||||
EVP_PKEY_free(pkey);
|
||||
}
|
||||
if (fail)
|
||||
BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x",
|
||||
op);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user