cipher should only be set to PSK if JPAKE is used.

This commit is contained in:
Richard Levitte 2012-03-14 12:39:00 +00:00
parent 07e120b7da
commit 49f6cb968f

View File

@ -993,14 +993,13 @@ bad:
goto end;
}
psk_identity = "JPAKE";
if (cipher)
{
BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
goto end;
}
cipher = "PSK";
}
if (cipher)
{
BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
goto end;
}
cipher = "PSK";
#endif
OpenSSL_add_ssl_algorithms();