Fix comment and variable name in macro definition.

patches.chromium/channelid.patch

 diff -burN android-openssl.orig/crypto/bio/bio.h android-openssl/crypto/bio/bio.h
 --- android-openssl.orig/crypto/bio/bio.h       2013-02-11 16:26:04.000000000 +0100
 +++ android-openssl/crypto/bio/bio.h    2013-10-22 18:22:42.080337200 +0200
 @@ -266,6 +266,9 @@
  #define BIO_RR_CONNECT                 0x02
  /* Returned from the accept BIO when an accept would have blocked */
  #define BIO_RR_ACCEPT                  0x03
 +/* Returned from the SSL bio when the channel id retrieval code cannot find the
 + * private key. */
 +#define BIO_RR_SSL_CHANNEL_ID_LOOKUP   0x04
@@ skipping 60 matching lines @@
  #define SSL_CTRL_SET_TMP_RSA                   2
 @@ -1672,10 +1680,11 @@
  #define SSL_set_tmp_ecdh(ssl,ecdh) \
         SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
  
 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client
 - * IDs from clients. Returns 1 on success. */
 -#define SSL_enable_tls_channel_id(ctx) \
 -       SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL)
 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS client
-+ * IDs from clients, or configure a client to send TLS client IDs to server.
++ * IDs from clients, or configures a client to send TLS client IDs to server.
 + * Returns 1 on success. */
-+#define SSL_enable_tls_channel_id(s) \
-+       SSL_ctrl(s,SSL_CTRL_CHANNEL_ID,0,NULL)
++#define SSL_enable_tls_channel_id(ssl) \
++       SSL_ctrl(ssl,SSL_CTRL_CHANNEL_ID,0,NULL)
  /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to
   * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on
   * success. */
 diff -burN android-openssl.orig/ssl/bio_ssl.c android-openssl/ssl/bio_ssl.c
 --- android-openssl.orig/ssl/bio_ssl.c  2013-02-11 16:26:04.000000000 +0100
 +++ android-openssl/ssl/bio_ssl.c       2013-10-22 18:22:42.090337290 +0200
 @@ -206,6 +206,10 @@
                 BIO_set_retry_special(b);
                 retry_reason=BIO_RR_SSL_X509_LOOKUP;
                 break;
@@ skipping 118 matching lines @@
  #define SSL_CTRL_SET_TMP_RSA                   2
 @@ -1672,10 +1680,11 @@
  #define SSL_set_tmp_ecdh(ssl,ecdh) \
         SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
  
 -/* SSL_enable_tls_channel_id configures a TLS server to accept TLS client
 - * IDs from clients. Returns 1 on success. */
 -#define SSL_enable_tls_channel_id(ctx) \
 -       SSL_ctrl(ctx,SSL_CTRL_CHANNEL_ID,0,NULL)
 +/* SSL_enable_tls_channel_id either configures a TLS server to accept TLS client
-+ * IDs from clients, or configure a client to send TLS client IDs to server.
++ * IDs from clients, or configures a client to send TLS client IDs to server.
 + * Returns 1 on success. */
-+#define SSL_enable_tls_channel_id(s) \
-+       SSL_ctrl(s,SSL_CTRL_CHANNEL_ID,0,NULL)
++#define SSL_enable_tls_channel_id(ssl) \
++       SSL_ctrl(ssl,SSL_CTRL_CHANNEL_ID,0,NULL)
  /* SSL_set1_tls_channel_id configures a TLS client to send a TLS Channel ID to
   * compatible servers. private_key must be a P-256 EVP_PKEY*. Returns 1 on
   * success. */
 diff -burN android-openssl.orig/ssl/ssl_lib.c android-openssl/ssl/ssl_lib.c
 --- android-openssl.orig/ssl/ssl_lib.c  2013-10-22 18:20:40.299252871 +0200
 +++ android-openssl/ssl/ssl_lib.c       2013-10-22 18:22:42.090337290 +0200
 @@ -2561,6 +2561,10 @@
                 {
                 return(SSL_ERROR_WANT_X509_LOOKUP);
                 }
@@ skipping 18 matching lines @@
 +       }
 +
 +void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL * ssl, EVP_PKEY **pkey)
 +       {
 +       return ctx->channel_id_cb;
 +       }
 +
  #ifndef OPENSSL_NO_ENGINE
  int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e)
         {