Fossil

Check-in [5c40d6b0]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Since libressl abuses OPENSSL_VERSION_NUMBER, don't let fossil being confused by that.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5c40d6b0d4cbcafb8fc662465c4f76066a21ea4c38964e3d7e2bc8d8d277c26f
User & Date: jan.nijtmans 2019-05-23 06:44:09
Context
2019-05-23
19:29
Since libressl abuses OPENSSL_VERSION_NUMBER, don't let fossil being confused by that. Leaf check-in: 06cb09dd user: jan.nijtmans tags: branch-2.8
17:07
Update the built-in SQLite to the latest 3.29.0 alpha. check-in: 4f040a18 user: drh tags: trunk
06:44
Since libressl abuses OPENSSL_VERSION_NUMBER, don't let fossil being confused by that. check-in: 5c40d6b0 user: jan.nijtmans tags: trunk
2019-05-21
19:04
Improved computation of the rail mapper for timelines on a branch. If the branch is across two or more rails, then all rails of that branch are moved to the left as far as practical. check-in: d19df616 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/http_ssl.c.

385
386
387
388
389
390
391


392

393
394
395
396
397
398
399
  }

  /* Set the Global.zIpAddr variable to the server we are talking to.
  ** This is used to populate the ipaddr column of the rcvfrom table,
  ** if any files are received from the server.
  */
  {


#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L

    char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
    g.zIpAddr = mprintf("%s", ip);
    OPENSSL_free(ip);
#else
    /* IPv4 only code */
    const unsigned char *ip;
    ip = (const unsigned char*)BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);







>
>
|
>







385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
  }

  /* Set the Global.zIpAddr variable to the server we are talking to.
  ** This is used to populate the ipaddr column of the rcvfrom table,
  ** if any files are received from the server.
  */
  {
  /* As soon as libressl implements BIO_ADDR_hostname_string/BIO_get_conn_address.
   * check here for the correct LIBRESSL_VERSION_NUMBER too. For now: disable */
  #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L \
      && !defined(LIBRESSL_VERSION_NUMBER)
    char *ip = BIO_ADDR_hostname_string(BIO_get_conn_address(iBio),1);
    g.zIpAddr = mprintf("%s", ip);
    OPENSSL_free(ip);
#else
    /* IPv4 only code */
    const unsigned char *ip;
    ip = (const unsigned char*)BIO_ptr_ctrl(iBio,BIO_C_GET_CONNECT,2);