Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OpenVPN/openvpn
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.6.11
Choose a base ref
...
head repository: OpenVPN/openvpn
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.6.12
Choose a head ref
  • 4 commits
  • 17 files changed
  • 4 contributors

Commits on Jun 26, 2024

  1. Http-proxy: fix bug preventing proxy credentials caching

    Caching proxy credentials was not working due to the
    lack of handling already defined creds in get_user_pass(),
    which prevented the caching from working properly.
    
    Fix this issue by getting the value of c->first_time,
    that indicates if we're at the first iteration
    of the main loop and use it as second argument of the
    get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP
    upon instance context restart credentials would be erased
    every time.
    
    The nocache member has been added to the struct
    http_proxy_options and also a getter method to retrieve
    that option from ssl has been added, by doing this
    we're able to erase previous queried user credentials
    to ensure correct operation.
    
    Fixes: Trac #1187
    Signed-off-by: Gianmarco De Gregori <gianmarco@mandelbit.com>
    Acked-by: Gert Doering <gert@greenie.muc.de>
    Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
    Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
    Message-Id: <20240623200551.20092-1-gert@greenie.muc.de>
    URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28835.html
    Signed-off-by: Gert Doering <gert@greenie.muc.de>
    (cherry picked from commit 3cfd6f9)
    itsGiaan authored and cron2 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    ad0c2c0 View commit details
    Browse the repository at this point in the history
  2. configure: Try to detect LZO with pkg-config

    On most systems this should work just fine.
    
    v2:
     - simplify code by removing -llzo special handling
    v3:
     - reintroduce support for autodetection without pkg-config,
       no need to break backwards compatibility right now
    v7:
     - Handle case correctly where lzo/lzo1x.h can not be included
       at all. On most distros this works even though the .pc
       file suggests to use it without. We had some partly
       solution for that but it wasn't really working.
    v8:
     - Handle systems that do not implicitly include limits.h
       in configure test builds.
       lzodefs.h usually relies on lzoconf.h to include it.
    
    Change-Id: I1c038dc4ec80d3499582d81eee61fee74f26e693
    Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
    Acked-by: Gert Doering <gert@greenie.muc.de>
    Message-Id: <20240626161921.179301-1-frank@lichtenheld.com>
    URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28848.html
    Signed-off-by: Gert Doering <gert@greenie.muc.de>
    (cherry picked from commit 0ea5126)
    flichtenheld authored and cron2 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    3c43b01 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Allow trailing \r and \n in control channel message

    Writing a reason from a script will easily end up adding extra \r\n characters
    at the end of the reason. Our current code pushes this to the peer. So be more
    liberal in accepting these message.
    
    Github: closes #568
    
    Change-Id: I47c992b6b73b1475cbff8a28f720cf50dc1fbe3e
    Signed-off-by: Arne Schwabe <arne@rfc2549.org>
    Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
    Message-Id: <20240710140623.172829-1-frank@lichtenheld.com>
    URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28910.html
    Signed-off-by: Gert Doering <gert@greenie.muc.de>
    (cherry picked from commit be31325)
    schwabe authored and cron2 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    3435739 View commit details
    Browse the repository at this point in the history
  2. preparing release 2.6.12

    version.m4, ChangeLog, Changes.rst
    
    Signed-off-by: Gert Doering <gert@greenie.muc.de>
    cron2 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    038a94b View commit details
    Browse the repository at this point in the history
Loading