Small bugfixes to the KSSL implementation.

PR: 349

diff --git a/ssl/kssl.h b/ssl/kssl.h
index 0cfd219bf4f9c013e9fe35c42da8406ecbcbe668..cf7ebdd168ed9094c312e9258ee5fb4b29d585ef 100644 (file)
--- 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 a756556691316b8c8930bc9693e173112d585a42..1153aeda7481c35c89f0dd89302a529d94895ee2 100644 (file)
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -228,7 +228,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 692f6a397ea2eb0a61bc688cc089bfcb9ef30ae6..b18c5e2fc84da39673054e55719030b108dba3bd 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -698,7 +698,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);