wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RT2962: add -keytab and -krb5svc flags.

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2015-04-25 23:08:00 -04:00
parent a194ee7b9a
commit 5d307e7b5a
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/s_server.c
View file

@ -228,6 +228,8 @@ static int s_server_verify = SSL_VERIFY_NONE;
static int s_server_session_id_context = 1; /* anything will do */
static const char *s_cert_file = TEST_CERT, *s_key_file =
NULL, *s_chain_file = NULL;
static const char *krb5svc = NULL;
static const char *krb5tab = NULL;
#ifndef OPENSSL_NO_TLSEXT
static const char *s_cert_file2 = TEST_CERT2, *s_key_file2 = NULL;
#endif
@ -839,7 +841,8 @@ typedef enum OPTION_choice {
OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN,
OPT_S_ENUM,
OPT_V_ENUM,
OPT_X_ENUM
OPT_X_ENUM,
OPT_KRB5SVC, OPT_KRBTAB
} OPTION_CHOICE;
OPTIONS s_server_options[] = {
@ -897,6 +900,8 @@ OPTIONS s_server_options[] = {
{"jpake", OPT_JPAKE, 's', "JPAKE secret to use"},
# endif
#endif
{"krb5svc", OPT_KRB5SVC, 's', "Kerberos service name"},
{"keytab", OPT_KRBTAB, '<', "Kerberos keytab file"},
#ifndef OPENSSL_NO_SRP
{"srpvfile", OPT_SRPVFILE, '<', "The verifier file for SRP"},
{"srpuserseed", OPT_SRPUSERSEED, 's',
@ -1413,6 +1418,12 @@ int s_server_main(int argc, char *argv[])
case OPT_JPAKE:
goto opthelp;
#endif
case OPT_KRB5SVC:
krb5svc = opt_arg();
break;
case OPT_KRBTAB:
krb5tab = opt_arg();
break;
case OPT_SRTP_PROFILES:
srtp_profiles = opt_arg();
break;