commit da881e9a15f673e862eeeb30c3112aa88c747ede
author David Benjamin <davidben@chromium.org> Sun Apr 26 14:45:04 2015 -0400
committer Adam Langley <agl@google.com> Wed May 06 22:13:13 2015 +0000
tree 14904fd141343434271378bfc07525aac9b09f87
parent 61ecccfa3eee14427b357c1206c06ff0c4ecb0a8

Promote deprecated statistics macros to functions.

Not going to bother adding the compatibility macros. If they get ifdef'd
out, all the better.

BUG=404754

Change-Id: I26414d2fb84ee1f0b15a3b96c871949fe2bb7fb1
Reviewed-on: https://boringssl-review.googlesource.com/4558
Reviewed-by: Adam Langley <agl@google.com>

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 0cfcead..961dec0 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1095,21 +1095,6 @@
     case SSL_CTRL_SESS_NUMBER:
       return lh_SSL_SESSION_num_items(ctx->sessions);
 
-    case SSL_CTRL_SESS_CONNECT:
-    case SSL_CTRL_SESS_CONNECT_GOOD:
-    case SSL_CTRL_SESS_CONNECT_RENEGOTIATE:
-    case SSL_CTRL_SESS_ACCEPT:
-    case SSL_CTRL_SESS_ACCEPT_GOOD:
-    case SSL_CTRL_SESS_ACCEPT_RENEGOTIATE:
-    case SSL_CTRL_SESS_HIT:
-    case SSL_CTRL_SESS_CB_HIT:
-    case SSL_CTRL_SESS_MISSES:
-    case SSL_CTRL_SESS_TIMEOUTS:
-    case SSL_CTRL_SESS_CACHE_FULL:
-      /* Statistics are no longer supported.
-       * TODO(davidben): Try to remove the accessors altogether. */
-      return 0;
-
     case SSL_CTRL_SET_MAX_SEND_FRAGMENT:
       if (larg < 512 || larg > SSL3_RT_MAX_PLAIN_LENGTH) {
         return 0;
@@ -2990,3 +2975,15 @@
   return EVP_AEAD_CTX_get_rc4_state(&ssl->aead_read_ctx->ctx, read_key) &&
          EVP_AEAD_CTX_get_rc4_state(&ssl->aead_write_ctx->ctx, write_key);
 }
+
+int SSL_CTX_sess_connect(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_connect_good(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_connect_renegotiate(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_accept(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_accept_renegotiate(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_accept_good(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_hits(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_cb_hits(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_misses(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_timeouts(const SSL_CTX *ctx) { return 0; }
+int SSL_CTX_sess_cache_full(const SSL_CTX *ctx) { return 0; }