Jan Ehrhardt in gmane.comp.web.curl.library (Wed, 25 Feb 2015 13:15:58 +0100):
>I will change the OCSP_RESPDATA in ocsp.h into something else to see if
>that file is actually included. Then it should generate an error for
>OCSP_RESPDATA.

The conclusion was that it loaded the openssl/ocsp.c from the right directory.
When I saw where OCSP_RESPONSE was defined I added this after line 202 of
ossl_typ.h:

 typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
 typedef struct ocsp_response_st OCSP_RESPONSE;
+typedef struct ocsp_basicresp_st OCSP_BASICRESP;
 typedef struct ocsp_responder_id_st OCSP_RESPID;

In ocsp.h I also changed a thing:

     variant should be used. -- Richard Levitte, OpenSSL team and CeloCom */
-typedef struct ocsp_basic_response_st
+typedef struct ocsp_basicresp_st
     {
     OCSP_RESPDATA *tbsResponseData;

And the last change was to move

#ifndef HAVE_BORINGSSL
#include <openssl/ocsp.h>
#endif

in Curl's openssl.c from line 66 to line 1323.

I do not know why the last change was needed, but without it I got these
errors:

        cl.exe /O2 /DNDEBUG /MD /DCURL_STATICLIB /I. /I ../lib /I../include /nologo /W3 /EH
sc /DWIN32 /FD /c /DBUILDING_LIBCURL /I"../../win32build.vc11/include" /DUSE_SSLEAY /I"../.
./win32build.vc11/include/openssl" /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /DHAVE_LIBSSH2 /DH
AVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /DUSE_LIBSSH2 /I../../win32build.vc11/inclu
de/libssh2 /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES /DUSE_IPV6 /DUSE_WINDOWS_SSPI /Fo"..\bu
ilds\libcurl-vc11-x86-release-static-ssl-static-zlib-static-ssh2-static-ipv6-sspi-obj-lib/v
tls/openssl.obj" ..\lib\vtls\openssl.c
openssl.c
..\lib\vtls\openssl.c(1349) : warning C4013: 'd2i_OCSP_RESPONSE' undefined; assuming extern
 returning int
..\lib\vtls\openssl.c(1349) : warning C4047: '=' : 'OCSP_RESPONSE *' differs in levels of i
ndirection from 'int'
..\lib\vtls\openssl.c(1356) : warning C4013: 'OCSP_response_status' undefined; assuming ext
ern returning int
..\lib\vtls\openssl.c(1357) : error C2065: 'OCSP_RESPONSE_STATUS_SUCCESSFUL' : undeclared i
dentifier
..\lib\vtls\openssl.c(1359) : warning C4013: 'OCSP_response_status_str' undefined; assuming
 extern returning int
..\lib\vtls\openssl.c(1364) : warning C4013: 'OCSP_response_get1_basic' undefined; assuming
 extern returning int
..\lib\vtls\openssl.c(1364) : warning C4047: '=' : 'OCSP_BASICRESP *' differs in levels of
indirection from 'int'
..\lib\vtls\openssl.c(1382) : error C2037: left of 'certs' specifies undefined struct/union
 'ocsp_basicresp_st'
..\lib\vtls\openssl.c(1382) : fatal error C1903: unable to recover from previous error(s);
stopping compilation
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN\cl.
exe"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\BIN\nma
ke.exe"' : return code '0x2'
Stop.

Jan

-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2015-02-25