From 43ef90ae038229515964498083955db987d213a0 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 03 Jan 2021 02:23:43 -0500
Subject: patches: Fix undeclared symbols

Fixes:

      CC       vtls/libcurl_la-wolfssl.lo
    vtls/wolfssl.c: In function 'do_file_type':
    vtls/wolfssl.c:207:12: error: 'SSL_FILETYPE_PEM' undeclared (first use in this function); did you mean 'WOLFSSL_FILETYPE_PEM'?
         return SSL_FILETYPE_PEM;
                ^~~~~~~~~~~~~~~~
                WOLFSSL_FILETYPE_PEM
    vtls/wolfssl.c:207:12: note: each undeclared identifier is reported only once for each function it appears in
    vtls/wolfssl.c:211:12: error: 'SSL_FILETYPE_ASN1' undeclared (first use in this function); did you mean 'WOLFSSL_FILETYPE_ASN1'?
         return SSL_FILETYPE_ASN1;
                ^~~~~~~~~~~~~~~~~
                WOLFSSL_FILETYPE_ASN1
    vtls/wolfssl.c: In function 'wolfssl_connect_step1':
    vtls/wolfssl.c:407:50: error: 'SSL_VERIFY_PEER' undeclared (first use in this function); did you mean 'WOLFSSL_VERIFY_PEER'?
                          SSL_CONN_CONFIG(verifypeer)?SSL_VERIFY_PEER:
                                                      ^~~~~~~~~~~~~~~
                                                      WOLFSSL_VERIFY_PEER
    vtls/wolfssl.c:408:50: error: 'SSL_VERIFY_NONE' undeclared (first use in this function); did you mean 'WOLFSSL_VERIFY_NONE'?
                                                      SSL_VERIFY_NONE,
                                                      ^~~~~~~~~~~~~~~
                                                      WOLFSSL_VERIFY_NONE
    vtls/wolfssl.c: In function 'wolfssl_connect_step2':
    vtls/wolfssl.c:564:15: error: 'SSL_FAILURE' undeclared (first use in this function); did you mean 'WOLFSSL_FAILURE'?
         if(ret == SSL_FAILURE)
                   ^~~~~~~~~~~
                   WOLFSSL_FAILURE
    vtls/wolfssl.c:598:8: error: 'SSL_ERROR_WANT_READ' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_READ'?
         if(SSL_ERROR_WANT_READ == detail) {
            ^~~~~~~~~~~~~~~~~~~
            WOLFSSL_ERROR_WANT_READ
    vtls/wolfssl.c:602:13: error: 'SSL_ERROR_WANT_WRITE' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_WRITE'?
         else if(SSL_ERROR_WANT_WRITE == detail) {
                 ^~~~~~~~~~~~~~~~~~~~
                 WOLFSSL_ERROR_WANT_WRITE
    vtls/wolfssl.c: In function 'wolfssl_send':
    vtls/wolfssl.c:814:10: error: 'SSL_ERROR_WANT_READ' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_READ'?
         case SSL_ERROR_WANT_READ:
              ^~~~~~~~~~~~~~~~~~~
              WOLFSSL_ERROR_WANT_READ
    vtls/wolfssl.c:815:10: error: 'SSL_ERROR_WANT_WRITE' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_WRITE'?
         case SSL_ERROR_WANT_WRITE:
              ^~~~~~~~~~~~~~~~~~~~
              WOLFSSL_ERROR_WANT_WRITE
    vtls/wolfssl.c: In function 'wolfssl_recv':
    vtls/wolfssl.c:862:10: error: 'SSL_ERROR_ZERO_RETURN' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_ZERO_RETURN'?
         case SSL_ERROR_ZERO_RETURN: /* no more data */
              ^~~~~~~~~~~~~~~~~~~~~
              WOLFSSL_ERROR_ZERO_RETURN
    vtls/wolfssl.c:864:10: error: 'SSL_ERROR_WANT_READ' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_READ'?
         case SSL_ERROR_WANT_READ:
              ^~~~~~~~~~~~~~~~~~~
              WOLFSSL_ERROR_WANT_READ
    vtls/wolfssl.c:865:10: error: 'SSL_ERROR_WANT_WRITE' undeclared (first use in this function); did you mean 'WOLFSSL_ERROR_WANT_WRITE'?
         case SSL_ERROR_WANT_WRITE:
              ^~~~~~~~~~~~~~~~~~~~
              WOLFSSL_ERROR_WANT_WRITE
    vtls/wolfssl.c: In function 'Curl_wolfssl_init':
    vtls/wolfssl.c:903:29: error: 'SSL_SUCCESS' undeclared (first use in this function); did you mean 'WOLFSSL_SUCCESS'?
       return (wolfSSL_Init() == SSL_SUCCESS);
                                 ^~~~~~~~~~~
                                 WOLFSSL_SUCCESS
    make[3]: *** [Makefile:2675: vtls/libcurl_la-wolfssl.lo] Error 1
    make[3]: Leaving directory '/prokit/sessions/448429946/wd/tmp/src/lib'
    make[2]: *** [Makefile:1077: all] Error 2
    make[2]: Leaving directory '/prokit/sessions/448429946/wd/tmp/src/lib'
    make[1]: *** [Makefile:996: all-recursive] Error 1
    make[1]: Leaving directory '/prokit/sessions/448429946/wd/tmp/src'
    make: *** [../build:12: build] Error 2
---
(limited to 'changelog')

diff --git a/changelog b/changelog
index 8e33d01..4e21387 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ curl (7.74.0-1) trunk
   * libcurl.4-dev: Remove static library.
   * Link against wolfSSL for HTTPS support and depend on NSS CA root
     certificates.
+    - Add patch to fix undeclared symbol errors when compiling against
+      wolfSSL built without OPENSSL_EXTRA.
   * Organize packages into sections.
   * Reword package descriptions.
   * curl-doc: Rename to curl.4-doc.
--
cgit v0.9.1