Author: rjung
Date: Sun Jun 19 13:44:52 2016
New Revision: 1749175
URL: http://svn.apache.org/viewvc?rev=1749175&view=rev
Log:
Remove use of OCSP_F_OCSP_SENDREQ_BIO for OpenSSL
1.1.0. It is no longer available there and the generated
error message is questionable anyhow.
Fix comment typo.
Add comment about possibly missing error handling.
Modified:
tomcat/native/trunk/native/src/sslutils.c
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1749175&r1=1749174&r2=1749175&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Sun Jun 19 13:44:52 2016
@@ -771,7 +771,9 @@ static OCSP_RESPONSE *parse_ocsp_resp(ch
BIO_write(mem, buf, len); /* write the buffer to the bio */
if (BIO_gets(mem, tmpbuf, 512) <= 0) {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
+#endif
goto err;
}
/* Parse the HTTP response. This will look like this:
@@ -828,12 +830,13 @@ static OCSP_RESPONSE *parse_ocsp_resp(ch
goto err;
}
err:
+ /* XXX No error logging? */
BIO_free(mem);
return resp;
}
-/* Reads the respnse from the APR socket to a buffer, and parses the buffer to
+/* Reads the response from the APR socket to a buffer, and parses the buffer to
return the OCSP response */
#define ADDLEN 512
static OCSP_RESPONSE *ocsp_get_resp(apr_socket_t *sock)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
