Skip to content

Commit e418773

Browse files
andyoneandyone
authored
Merge pull request #57 from essentialkaos/develop
Version 2.6.0
2 parents 6749eb6 + 72b8be6 commit e418773

7 files changed

Lines changed: 31 additions & 26 deletions

File tree

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: go
22

33
go:
4-
- 1.11.x
54
- 1.12.x
65
- 1.13.x
6+
- 1.14.x
77
- tip
88

99
os:
@@ -19,7 +19,7 @@ branches:
1919

2020
env:
2121
global:
22-
- IMAGE=essentialkaos/perfecto:centos7
22+
- IMAGE=essentialkaos/perfecto:centos7 HADOLINT_VERSION=1.17.5
2323

2424
matrix:
2525
fast_finish: true
@@ -29,7 +29,7 @@ matrix:
2929
before_install:
3030
- docker pull "$IMAGE"
3131
- wget https://kaos.sh/perfecto/perfecto-docker
32-
- wget -O hadolint https://github.com/hadolint/hadolint/releases/download/v1.17.4/hadolint-Linux-x86_64
32+
- wget -O hadolint https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-x86_64
3333
- chmod +x perfecto-docker
3434
- chmod +x hadolint
3535
- ./hadolint --version

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ git-config: ## Configure git redirects for stable import path services
2727
git config --global http.https://pkg.re.followRedirects true
2828

2929
deps: git-config ## Download dependencies
30-
go get -d -v pkg.re/essentialkaos/ek.v11
30+
go get -d -v pkg.re/essentialkaos/ek.v12
3131
go get -d -v pkg.re/essentialkaos/sslscan.v12
3232

3333
fmt: ## Format source code with gofmt

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before the initial install allows git to use redirects for [pkg.re](https://gith
2929
git config --global http.https://pkg.re.followRedirects true
3030
```
3131

32-
To build the SSLScan Client from scratch, make sure you have a working Go 1.11+ workspace ([instructions](https://golang.org/doc/install)), then:
32+
To build the SSLScan Client from scratch, make sure you have a working Go 1.12+ workspace ([instructions](https://golang.org/doc/install)), then:
3333

3434
```
3535
go get github.com/essentialkaos/sslcli

‎cli/cli.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cli
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
5+
// Copyright (c) 2009-2020 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //
@@ -17,16 +17,16 @@ import (
1717
"strings"
1818
"time"
1919

20-
"pkg.re/essentialkaos/ek.v11/fmtc"
21-
"pkg.re/essentialkaos/ek.v11/fmtutil"
22-
"pkg.re/essentialkaos/ek.v11/fsutil"
23-
"pkg.re/essentialkaos/ek.v11/options"
24-
"pkg.re/essentialkaos/ek.v11/strutil"
25-
"pkg.re/essentialkaos/ek.v11/usage"
26-
"pkg.re/essentialkaos/ek.v11/usage/completion/bash"
27-
"pkg.re/essentialkaos/ek.v11/usage/completion/fish"
28-
"pkg.re/essentialkaos/ek.v11/usage/completion/zsh"
29-
"pkg.re/essentialkaos/ek.v11/usage/update"
20+
"pkg.re/essentialkaos/ek.v12/fmtc"
21+
"pkg.re/essentialkaos/ek.v12/fmtutil"
22+
"pkg.re/essentialkaos/ek.v12/fsutil"
23+
"pkg.re/essentialkaos/ek.v12/options"
24+
"pkg.re/essentialkaos/ek.v12/strutil"
25+
"pkg.re/essentialkaos/ek.v12/usage"
26+
"pkg.re/essentialkaos/ek.v12/usage/completion/bash"
27+
"pkg.re/essentialkaos/ek.v12/usage/completion/fish"
28+
"pkg.re/essentialkaos/ek.v12/usage/completion/zsh"
29+
"pkg.re/essentialkaos/ek.v12/usage/update"
3030

3131
"pkg.re/essentialkaos/sslscan.v12"
3232
)
@@ -35,7 +35,7 @@ import (
3535

3636
const (
3737
APP = "SSLScan Client"
38-
VER = "2.5.0"
38+
VER = "2.6.0"
3939
DESC = "Command-line client for the SSL Labs API"
4040
)
4141

‎cli/details.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cli
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
5+
// Copyright (c) 2009-2020 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //
@@ -12,12 +12,12 @@ import (
1212
"strings"
1313
"time"
1414

15-
"pkg.re/essentialkaos/ek.v11/fmtc"
16-
"pkg.re/essentialkaos/ek.v11/fmtutil"
17-
"pkg.re/essentialkaos/ek.v11/pluralize"
18-
"pkg.re/essentialkaos/ek.v11/sliceutil"
19-
"pkg.re/essentialkaos/ek.v11/strutil"
20-
"pkg.re/essentialkaos/ek.v11/timeutil"
15+
"pkg.re/essentialkaos/ek.v12/fmtc"
16+
"pkg.re/essentialkaos/ek.v12/fmtutil"
17+
"pkg.re/essentialkaos/ek.v12/pluralize"
18+
"pkg.re/essentialkaos/ek.v12/sliceutil"
19+
"pkg.re/essentialkaos/ek.v12/strutil"
20+
"pkg.re/essentialkaos/ek.v12/timeutil"
2121

2222
"pkg.re/essentialkaos/sslscan.v12"
2323
)
@@ -1126,6 +1126,7 @@ func print0RTTStatus(status int) {
11261126
func printPolicyInfo(policy *sslscan.HPKPPolicy) {
11271127
if policy == nil {
11281128
fmtc.Println("No")
1129+
return
11291130
}
11301131

11311132
switch policy.Status {

‎common/sslcli.spec‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
Summary: Pretty awesome command-line client for public SSLLabs API
4646
Name: sslcli
47-
Version: 2.5.0
47+
Version: 2.6.0
4848
Release: 0%{?dist}
4949
Group: Applications/System
5050
License: EKOL
@@ -119,6 +119,10 @@ fi
119119
################################################################################
120120

121121
%changelog
122+
* Wed May 06 2020 Anton Novojilov <andy@essentialkaos.com> - 2.6.0-0
123+
- Fixed panic if HPKPPolicy is empty
124+
- ek package updated to v12
125+
122126
* Fri Jan 03 2020 Anton Novojilov <andy@essentialkaos.com> - 2.5.0-0
123127
- Updated for compatibility with the latest version of SSLLabs API
124128

‎sslcli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package main
44

55
// ////////////////////////////////////////////////////////////////////////////////// //
66
// //
7-
// Copyright (c) 2009-2019 ESSENTIAL KAOS //
7+
// Copyright (c) 2009-2020 ESSENTIAL KAOS //
88
// Apache License, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0> //
99
// //
1010
// ////////////////////////////////////////////////////////////////////////////////// //

0 commit comments

Comments
 (0)