Author: jfclere
Date: Sat Jun 20 15:21:39 2015
New Revision: 1686638
URL: http://svn.apache.org/r1686638
Log:
Fix warnings.
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1686638&r1=1686637&r2=1686638&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Sat Jun 20 15:21:39 2015
@@ -1377,7 +1377,7 @@ TCN_IMPLEMENT_CALL(jstring, SSL, getNext
UNREFERENCED(o);
SSL_get0_next_proto_negotiated(ssl_, &proto, &proto_len);
- return tcn_new_stringn(e, proto, proto_len);
+ return tcn_new_stringn(e, (const char *)proto, (size_t) proto_len);
}
/*** End Twitter API Additions ***/
@@ -1399,7 +1399,7 @@ TCN_IMPLEMENT_CALL(jstring, SSL, getAlpn
UNREFERENCED(o);
SSL_get0_alpn_selected(ssl_, &proto, &proto_len);
- return tcn_new_stringn(e, proto, proto_len);
+ return tcn_new_stringn(e, (const char *) proto, (size_t) proto_len);
}
TCN_IMPLEMENT_CALL(jobjectArray, SSL, getPeerCertChain)(TCN_STDARGS,
@@ -1678,8 +1678,8 @@ TCN_IMPLEMENT_CALL(jboolean, SSL, setCip
TCN_IMPLEMENT_CALL(jbyteArray, SSL, getSessionId)(TCN_STDARGS, jlong ssl)
{
- int len;
- const char *session_id;
+ unsigned int len;
+ const unsigned char *session_id;
const SSL_SESSION *session;
jbyteArray bArray;
SSL *ssl_ = J2P(ssl, SSL *);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
