Author: kgiusti
Date: Thu Oct 11 18:44:25 2012
New Revision: 1397232
URL: http://svn.apache.org/viewvc?rev=1397232&view=rev
Log:
NO-JIRA: minor bugfixes.
Modified:
qpid/proton/trunk/proton-c/src/ssl/openssl.c
qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
Modified: qpid/proton/trunk/proton-c/src/ssl/openssl.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/openssl.c?rev=1397232&r1=1397231&r2=1397232&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/openssl.c Thu Oct 11 18:44:25 2012
@@ -444,12 +444,11 @@ bool pn_ssl_get_cipher_name(pn_ssl_t *ss
{
const SSL_CIPHER *c;
+ *buffer = '\0';
if (ssl->ssl && (c = SSL_get_current_cipher( ssl->ssl ))) {
const char *v = SSL_CIPHER_get_name(c);
if (v) {
- size_t len = pn_min( strlen(v), size );
- strncpy(buffer, v, len);
- buffer[len] = 0;
+ snprintf( buffer, size, "%s", v );
return true;
}
}
@@ -460,12 +459,11 @@ bool pn_ssl_get_protocol_name(pn_ssl_t *
{
const SSL_CIPHER *c;
+ *buffer = '\0';
if (ssl->ssl && (c = SSL_get_current_cipher( ssl->ssl ))) {
const char *v = SSL_CIPHER_get_version(c);
if (v) {
- size_t len = pn_min( strlen(v), size );
- strncpy(buffer, v, len);
- buffer[len] = 0;
+ snprintf( buffer, size, "%s", v );
return true;
}
}
Modified: qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c?rev=1397232&r1=1397231&r2=1397232&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c Thu Oct 11 18:44:25 2012
@@ -96,4 +96,13 @@ ssize_t pn_ssl_output(pn_ssl_t *ssl, cha
return PN_EOS;
}
+bool pn_ssl_get_cipher_name(pn_ssl_t *ssl, char *buffer, size_t size)
+{
+ return false;
+}
+
+bool pn_ssl_get_protocol_name(pn_ssl_t *ssl, char *buffer, size_t size)
+{
+ return false;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
