diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
| commit | 0cedaa6c89235ed396068f2ebf546c9a909439e1 (patch) | |
| tree | ea91d9b180fa36b1886b046a286630c089f57475 /ssl | |
| parent | f7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff) | |
| download | src-0cedaa6c89235ed396068f2ebf546c9a909439e1.tar.gz src-0cedaa6c89235ed396068f2ebf546c9a909439e1.zip | |
Import OpenSSL 0.9.8n.vendor/openssl/0.9.8n
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=206035
svn path=/vendor-crypto/openssl/0.9.8n/; revision=206037; tag=vendor/openssl/0.9.8n
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/kssl.c | 3 | ||||
| -rw-r--r-- | ssl/s3_pkt.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ssl/kssl.c b/ssl/kssl.c index 73401c92a3e9..5cba28b89b8b 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -1802,6 +1802,9 @@ kssl_ctx_show(KSSL_CTX *kssl_ctx) kssl_ctx->service_name ? kssl_ctx->service_name: KRB5SVC, KRB5_NT_SRV_HST, &princ); + if (krb5rc) + goto exit; + krb5rc = krb5_kt_get_entry(krb5context, krb5keytab, princ, 0 /* IGNORE_VNO */, diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index a2ba5748d5eb..5e3583c04d42 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -291,9 +291,9 @@ again: if (version != s->version) { SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER); - /* Send back error using their - * version number :-) */ - s->version=version; + if ((s->version & 0xFF00) == (version & 0xFF00)) + /* Send back error using their minor version number :-) */ + s->version = (unsigned short)version; al=SSL_AD_PROTOCOL_VERSION; goto f_err; } |