Merge pull request #2377 from drwetter/3.1dev_to_3.2_references

change references from 3.1dev to 3.2
This commit is contained in:
Dirk Wetter 2023-07-31 17:15:15 +02:00 committed by GitHub
commit c888475b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 27 deletions

View File

@ -11,7 +11,7 @@ Feel free to remove this line but please stick to the template. Not filling out
-->
**Which version are you referring to**
3.0.x or 3.1dev? We might close this right away otherwise.
3.0.x or 3.2?
**Please check this repo whether this is a known feature request**

View File

@ -8,4 +8,4 @@ assignees: ''
---
**Which version are you referring to**
3.0.x or 3.1dev? (please check also how old your version is compare to the ones here)
3.0.x or 3.2? (please check also how old your version is compare to the ones here)

View File

@ -1,21 +1,21 @@
name: docker-3.1dev
name: docker-3.2
on:
push:
branches:
- 3.1dev
- 3.2
workflow_dispatch:
schedule:
- cron: "0 8 * * 1"
env:
BUILD_VERSION: "3.1dev"
BUILD_VERSION: "3.2"
DOCKER_CLI_EXPERIMENTAL: enabled
jobs:
deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Source checkout

View File

@ -1,17 +1,6 @@
name: testssl.sh CI
on:
push:
paths-ignore:
- 'utils/**'
- 'doc/**'
- 'bin/**'
- '**.md'
- '**.pem'
- '**.pdf'
- '**.html'
- 'LICENSE'
- 'Dockerfile'
pull_request:
paths-ignore:
- 'utils/**'
@ -32,7 +21,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-22.04']
perl: ['5.26']
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
steps:

View File

@ -1,7 +1,7 @@
## Change Log
### Features implemented / improvements in 3.1dev
### Features implemented / improvements in 3.2
* Extend Server (cipher) preference: always now in wide mode instead of running all ciphers in the end (per default)
* Improved compatibility with OpenSSL 3.0

View File

@ -36,7 +36,7 @@ You can pull the image from dockerhub and run:
docker run --rm -t drwetter/testssl.sh --fs example.com
```
Supported tags are: ``3.1dev`` and ``latest`, which are the same, i.e. the rolling release. ``3.0`` is the latest stable version from git which might have a few improvements (see git log) over the released version 3.0.X.
Supported tags are: ``3.2`` and ``latest`, which are the same, i.e. the rolling release. ``3.0`` is the latest stable version from git which might have a few improvements (see git log) over the released version 3.0.X.
``docker run --rm -t drwetter/testssl.sh:stable example.com``.

View File

@ -5,7 +5,7 @@
[![Build Status](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml/badge.svg)](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drwetter/testssl.sh?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![License](https://img.shields.io/github/license/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/LICENSE)
[![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.1dev/Dockerfile.md)
[![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md)
`testssl.sh` is a free command line tool which checks a server's service on
any port for the support of TLS/SSL ciphers, protocols as well as some
@ -49,11 +49,12 @@ Update notification here or @ [mastodon](https://infosec.exchange/@testssl) (old
### Installation
You can download testssl.sh branch 3.1dev just by cloning this git repository:
You can download testssl.sh branch 3.2 just by cloning this git repository:
git clone --depth 1 https://github.com/drwetter/testssl.sh.git
Think of 3.1dev like a rolling release, see below. For the stable version help yourself by downloading the [ZIP](https://codeload.github.com/drwetter/testssl.sh/zip/3.0.4) or [tar.gz](https://codeload.github.com/drwetter/testssl.sh/tar.gz/3.0.4) archive. Just ``cd`` to the directory created (=INSTALLDIR) and run it off there.
3.2 is now the latest branch which evolved from 3.1dev. It's in the release candidate phase.
For the former stable version help yourself by downloading the [ZIP](https://codeload.github.com/drwetter/testssl.sh/zip/v3.0.8) or [tar.gz](https://codeload.github.com/drwetter/testssl.sh/tar.gz/v3.0.8) archive. Just ``cd`` to the directory created (=INSTALLDIR) and run it off there.
#### Docker
@ -68,12 +69,12 @@ Or if you have cloned this repo you also can just ``cd`` to the INSTALLDIR and r
docker build . -t imagefoo && docker run --rm -t imagefoo example.com
```
For more please consult [Dockerfile.md](https://github.com/drwetter/testssl.sh/blob/3.1dev/Dockerfile.md).
For more please consult [Dockerfile.md](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md).
### Status
We're currently in the development phase, version 3.1dev. 3.1dev will eventually become 3.2. Bigger features are developed in a separate branch before merged into 3.1dev to avoid hiccups or inconsistencies. Albeit we try to keep 3.1dev as solid as possible things will certainly change in 3.1dev. Think of the 3.1dev branch like a rolling release. So if you need stability the 3.0 branch is better for you.
We're currently in the release candidate phase for version 3.2. Bigger features will be developed in a separate branch before merged into a 3.3dev to avoid hiccups or inconsistencies.
Version 3.0.X receives bugfixes, labeled as 3.0.1, 3.0.2 and so on. This will happen until 3.2 is released.
@ -87,7 +88,7 @@ Support for 2.9.5 has been dropped. Supported is >= 3.0.x only.
### Contributing
Contributions are welcome! See [CONTRIBUTING.md](https://github.com/drwetter/testssl.sh/blob/3.1dev/CONTRIBUTING.md) for details. Please also have a look at the [Coding Convention](https://github.com/drwetter/testssl.sh/blob/3.1dev/Coding_Convention.md).
Contributions are welcome! See [CONTRIBUTING.md](https://github.com/drwetter/testssl.sh/blob/3.2/CONTRIBUTING.md) for details. Please also have a look at the [Coding Convention](https://github.com/drwetter/testssl.sh/blob/3.2/Coding_Convention.md).
### Bug reports

View File

@ -16,7 +16,7 @@ my $html="";
my $debughtml="";
my $edited_html="";
my $htmlfile="tmp.html";
my $check2run="--ip=one --ids-friendly --color 0 --htmlfile $htmlfile";
my $check2run="--ip=one --sneaky --ids-friendly --color 0 --htmlfile $htmlfile";
my $diff="";
die "Unable to open $prg" unless -f $prg;