Skip to content

Commit c888475

Browse files
authored
Merge pull request #2377 from drwetter/3.1dev_to_3.2_references
change references from 3.1dev to 3.2
2 parents 3c0ae46 + 2067ac8 commit c888475

8 files changed

Lines changed: 17 additions & 27 deletions

File tree

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Feel free to remove this line but please stick to the template. Not filling out
1111
-->
1212

1313
**Which version are you referring to**
14-
3.0.x or 3.1dev? We might close this right away otherwise.
14+
3.0.x or 3.2?
1515

1616

1717
**Please check this repo whether this is a known feature request**

.github/ISSUE_TEMPLATE/other-issues---question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ assignees: ''
88
---
99

1010
**Which version are you referring to**
11-
3.0.x or 3.1dev? (please check also how old your version is compare to the ones here)
11+
3.0.x or 3.2? (please check also how old your version is compare to the ones here)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
name: docker-3.1dev
1+
name: docker-3.2
22

33
on:
44
push:
55
branches:
6-
- 3.1dev
6+
- 3.2
77
workflow_dispatch:
88
schedule:
99
- cron: "0 8 * * 1"
1010

1111
env:
12-
BUILD_VERSION: "3.1dev"
12+
BUILD_VERSION: "3.2"
1313
DOCKER_CLI_EXPERIMENTAL: enabled
1414

1515
jobs:
1616

1717
deploy:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919

2020
steps:
2121
- name: Source checkout

.github/workflows/test.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
name: testssl.sh CI
22

33
on:
4-
push:
5-
paths-ignore:
6-
- 'utils/**'
7-
- 'doc/**'
8-
- 'bin/**'
9-
- '**.md'
10-
- '**.pem'
11-
- '**.pdf'
12-
- '**.html'
13-
- 'LICENSE'
14-
- 'Dockerfile'
154
pull_request:
165
paths-ignore:
176
- 'utils/**'
@@ -32,7 +21,7 @@ jobs:
3221
runs-on: ${{ matrix.os }}
3322
strategy:
3423
matrix:
35-
os: ['ubuntu-20.04']
24+
os: ['ubuntu-22.04']
3625
perl: ['5.26']
3726
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
3827
steps:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
## Change Log
33

4-
### Features implemented / improvements in 3.1dev
4+
### Features implemented / improvements in 3.2
55

66
* Extend Server (cipher) preference: always now in wide mode instead of running all ciphers in the end (per default)
77
* Improved compatibility with OpenSSL 3.0

Dockerfile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can pull the image from dockerhub and run:
3636
docker run --rm -t drwetter/testssl.sh --fs example.com
3737
```
3838

39-
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.
39+
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.
4040

4141
``docker run --rm -t drwetter/testssl.sh:stable example.com``.
4242

Readme.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Build Status](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml/badge.svg)](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml)
66
[![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)
77
[![License](https://img.shields.io/github/license/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/LICENSE)
8-
[![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.1dev/Dockerfile.md)
8+
[![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md)
99

1010
`testssl.sh` is a free command line tool which checks a server's service on
1111
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
4949

5050
### Installation
5151

52-
You can download testssl.sh branch 3.1dev just by cloning this git repository:
52+
You can download testssl.sh branch 3.2 just by cloning this git repository:
5353

5454
git clone --depth 1 https://github.com/drwetter/testssl.sh.git
5555

56-
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.
56+
3.2 is now the latest branch which evolved from 3.1dev. It's in the release candidate phase.
57+
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.
5758

5859
#### Docker
5960

@@ -68,12 +69,12 @@ Or if you have cloned this repo you also can just ``cd`` to the INSTALLDIR and r
6869
docker build . -t imagefoo && docker run --rm -t imagefoo example.com
6970
```
7071

71-
For more please consult [Dockerfile.md](https://github.com/drwetter/testssl.sh/blob/3.1dev/Dockerfile.md).
72+
For more please consult [Dockerfile.md](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md).
7273

7374

7475
### Status
7576

76-
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.
77+
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.
7778

7879
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.
7980

@@ -87,7 +88,7 @@ Support for 2.9.5 has been dropped. Supported is >= 3.0.x only.
8788

8889
### Contributing
8990

90-
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).
91+
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).
9192

9293
### Bug reports
9394

t/32_isHTML_valid.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ my $html="";
1616
my $debughtml="";
1717
my $edited_html="";
1818
my $htmlfile="tmp.html";
19-
my $check2run="--ip=one --ids-friendly --color 0 --htmlfile $htmlfile";
19+
my $check2run="--ip=one --sneaky --ids-friendly --color 0 --htmlfile $htmlfile";
2020
my $diff="";
2121
die "Unable to open $prg" unless -f $prg;
2222

0 commit comments

Comments
 (0)