bn/bn_add.c: favour counted loops over ifs and breaks.
[openssl.git] / ssl / ssl_sess.c
index 128d2d79422fb696a04c98c0373d2e914aef3f5d..9095363702cb88e798f5feea24d9704ab1602f22 100644 (file)
@@ -830,8 +830,6 @@ long SSL_SESSION_set_time(SSL_SESSION *s, long t)
 
 int SSL_SESSION_get_protocol_version(const SSL_SESSION *s)
 {
-    if (s == NULL)
-        return (0);
     return s->ssl_version;
 }
 
@@ -996,7 +994,7 @@ int ssl_clear_bad_session(SSL *s)
     if ((s->session != NULL) &&
         !(s->shutdown & SSL_SENT_SHUTDOWN) &&
         !(SSL_in_init(s) || SSL_in_before(s))) {
-        SSL_CTX_remove_session(s->ctx, s->session);
+        SSL_CTX_remove_session(s->session_ctx, s->session);
         return (1);
     } else
         return (0);