diff --git a/ssl/kssl.h b/ssl/kssl.h index 0cfd219bf4f9c013e9fe35c42da8406ecbcbe668..cf7ebdd168ed9094c312e9258ee5fb4b29d585ef 100644 --- a/ssl/kssl.h +++ b/ssl/kssl.h @@ -110,13 +110,12 @@ typedef unsigned char krb5_octet; #define KSSL_CLOCKSKEW 300; #endif -/* Unused #define KSSL_ERR_MAX 255 typedef struct kssl_err_st { int reason; char text[KSSL_ERR_MAX+1]; } KSSL_ERR; -*/ + /* Context for passing ** (1) Kerberos session key to SSL, and diff --git a/ssl/ssl3.h b/ssl/ssl3.h index b829791abd7397c871e966c60b82a625dc7dcec4..796dcbc52875e8fa344ad862e5a5837365d1b1b3 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -233,7 +233,7 @@ extern "C" { #define SSL3_TXT_KRB5_RC2_40_CBC_SHA "EXP-KRB5-RC2-CBC-SHA" #define SSL3_TXT_KRB5_RC4_40_SHA "EXP-KRB5-RC4-SHA" #define SSL3_TXT_KRB5_DES_40_CBC_MD5 "EXP-KRB5-DES-CBC-MD5" -#define SSL3_TXT_KRB5_DES_40_CBC_MD5 "EXP-KRB5-DES-CBC-MD5" +#define SSL3_TXT_KRB5_RC2_40_CBC_MD5 "EXP-KRB5-RC2-CBC-MD5" #define SSL3_TXT_KRB5_RC4_40_MD5 "EXP-KRB5-RC4-MD5" #define SSL3_SSL_SESSION_ID_LENGTH 32 diff --git a/ssl/ssltest.c b/ssl/ssltest.c index c60a8acddbc628a7868e863890d483d1a9026df1..fbdd2a9c41ec2641f8810b2af1d18e4efc72f255 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -766,7 +766,7 @@ bad: if(strlen(localhost) == sizeof localhost-1) { BIO_printf(bio_err,"localhost name too long\n"); - got end; + goto end; } kssl_ctx_setstring(c_ssl->kssl_ctx, KSSL_SERVER, localhost);