aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Sing <joshua@hypera.dev>2023-01-11 20:42:11 +1100
committerJoshua Sing <joshua@hypera.dev>2023-01-11 20:42:11 +1100
commit628d12afd276c2136b5af6ae3a38af1b34de93da (patch)
tree3a140c18c77a3ca8af3bf16aa97f0a87cc8e0117
parent7f8267d89124e995a3d09cdd863b27268714c42e (diff)
parent49a179f0d9996894aee38cb307c10bbb668273ff (diff)
downloadportable-628d12afd276c2136b5af6ae3a38af1b34de93da.tar.gz
portable-628d12afd276c2136b5af6ae3a38af1b34de93da.tar.bz2
portable-628d12afd276c2136b5af6ae3a38af1b34de93da.zip
Land #811
-rw-r--r--.github/workflows/coverity.yml4
-rw-r--r--ChangeLog6
-rw-r--r--README.md16
-rw-r--r--README.windows2
-rwxr-xr-xupdate.sh2
5 files changed, 15 insertions, 15 deletions
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 444cc0b..f805c33 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -7,9 +7,9 @@ on:
7jobs: 7jobs:
8 scan: 8 scan:
9 runs-on: ubuntu-latest 9 runs-on: ubuntu-latest
10 if: ${{ github.repository_owner == 'libressl-portable' }} 10 if: ${{ github.repository_owner == 'libressl' }}
11 env: 11 env:
12 COVERITY_SCAN_PROJECT_NAME: 'libressl-portable/portable' 12 COVERITY_SCAN_PROJECT_NAME: 'libressl/portable'
13 COVERITY_SCAN_BRANCH_PATTERN: '*' 13 COVERITY_SCAN_BRANCH_PATTERN: '*'
14 COVERITY_SCAN_NOTIFICATION_EMAIL: 'libressl-security@openbsd.org' 14 COVERITY_SCAN_NOTIFICATION_EMAIL: 'libressl-security@openbsd.org'
15 COVERITY_SCAN_BUILD_COMMAND_PREPEND: "./autogen.sh && ./configure && make dist && tar zxf libressl-*.tar.gz && rm libressl-*.tar.gz && cd libressl-* && mkdir build-static && mkdir build-shared && cmake -GNinja -DBUILD_SHARED_LIBS=ON .." 15 COVERITY_SCAN_BUILD_COMMAND_PREPEND: "./autogen.sh && ./configure && make dist && tar zxf libressl-*.tar.gz && rm libressl-*.tar.gz && cd libressl-* && mkdir build-static && mkdir build-shared && cmake -GNinja -DBUILD_SHARED_LIBS=ON .."
diff --git a/ChangeLog b/ChangeLog
index f382601..1a8bb80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,12 +19,12 @@ with relevant portions of the C library, to a Git repository. This makes it
19easier to follow all of the relevant changes to the upstream project in a 19easier to follow all of the relevant changes to the upstream project in a
20single place: 20single place:
21 21
22 https://github.com/libressl-portable/openbsd 22 https://github.com/libressl/openbsd
23 23
24The portable bits of the project are largely maintained out-of-tree, and their 24The portable bits of the project are largely maintained out-of-tree, and their
25history is also available from Git. 25history is also available from Git.
26 26
27 https://github.com/libressl-portable/portable 27 https://github.com/libressl/portable
28 28
29LibreSSL Portable Release Notes: 29LibreSSL Portable Release Notes:
30 30
@@ -2602,7 +2602,7 @@ LibreSSL Portable Release Notes:
2602 * Address POODLE attack by disabling SSLv3 by default 2602 * Address POODLE attack by disabling SSLv3 by default
2603 2603
2604 * Fix Eliptical Curve cipher selection bug 2604 * Fix Eliptical Curve cipher selection bug
2605 (https://github.com/libressl-portable/portable/issues/35) 2605 (https://github.com/libressl/portable/issues/35)
2606 2606
26072.1.0 - First release from the OpenBSD 5.7 tree 26072.1.0 - First release from the OpenBSD 5.7 tree
2608 * Added support for automatic ephemeral EC keys 2608 * Added support for automatic ephemeral EC keys
diff --git a/README.md b/README.md
index 464da18..f4015a1 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
1![LibreSSL image](https://www.libressl.org/images/libressl.jpg) 1![LibreSSL image](https://www.libressl.org/images/libressl.jpg)
2## Official portable version of [LibreSSL](https://www.libressl.org) ## 2## Official portable version of [LibreSSL](https://www.libressl.org) ##
3 3
4[![Linux Build Status](https://github.com/libressl-portable/portable/actions/workflows/linux_test.yml/badge.svg)](https://github.com/libressl-portable/portable/actions/workflows/linux_test.yml) 4[![Linux Build Status](https://github.com/libressl/portable/actions/workflows/linux_test.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux_test.yml)
5[![macOS Build Status](https://github.com/libressl-portable/portable/actions/workflows/macos_test.yml/badge.svg)](https://github.com/libressl-portable/portable/actions/workflows/macos_test.yml) 5[![macOS Build Status](https://github.com/libressl/portable/actions/workflows/macos_test.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/macos_test.yml)
6[![Android_Build Status](https://github.com/libressl-portable/portable/actions/workflows/android_test.yml/badge.svg)](https://github.com/libressl-portable/portable/actions/workflows/android_test.yml) 6[![Android_Build Status](https://github.com/libressl/portable/actions/workflows/android_test.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/android_test.yml)
7[![Cross_Build Status](https://github.com/libressl-portable/portable/actions/workflows/cross_test.yml/badge.svg)](https://github.com/libressl-portable/portable/actions/workflows/cross_test.yml) 7[![Cross_Build Status](https://github.com/libressl/portable/actions/workflows/cross_test.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/cross_test.yml)
8[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl) 8[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/libressl.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libressl)
9[![ASan Status](https://github.com/libressl-portable/portable/actions/workflows/linux_test_asan.yml/badge.svg)](https://github.com/libressl-portable/portable/actions/workflows/linux_test_asan.yml) 9[![ASan Status](https://github.com/libressl/portable/actions/workflows/linux_test_asan.yml/badge.svg)](https://github.com/libressl/portable/actions/workflows/linux_test_asan.yml)
10 10
11LibreSSL is a fork of [OpenSSL](https://www.openssl.org) 1.0.1g developed by the 11LibreSSL is a fork of [OpenSSL](https://www.openssl.org) 1.0.1g developed by the
12[OpenBSD](https://www.openbsd.org) project. Our goal is to modernize the codebase, 12[OpenBSD](https://www.openbsd.org) project. Our goal is to modernize the codebase,
@@ -52,11 +52,11 @@ OpenBSD mirror in directory
52although we suggest that you use a [mirror](https://www.openbsd.org/ftp.html). 52although we suggest that you use a [mirror](https://www.openbsd.org/ftp.html).
53 53
54The LibreSSL portable build framework is also 54The LibreSSL portable build framework is also
55[mirrored](https://github.com/libressl-portable/portable) in Github. 55[mirrored](https://github.com/libressl/portable) on GitHub.
56 56
57Please report bugs either to the public libressl@openbsd.org mailing list, 57Please report bugs either to the public libressl@openbsd.org mailing list,
58or to the github 58or to the GitHub
59[issue tracker](https://github.com/libressl-portable/portable/issues) 59[issue tracker](https://github.com/libressl/portable/issues)
60 60
61Severe vulnerabilities or bugs requiring coordination with OpenSSL can be 61Severe vulnerabilities or bugs requiring coordination with OpenSSL can be
62sent to the core team at libressl-security@openbsd.org. 62sent to the core team at libressl-security@openbsd.org.
diff --git a/README.windows b/README.windows
index a88ddc9..1a9b7b5 100644
--- a/README.windows
+++ b/README.windows
@@ -46,7 +46,7 @@ problem.
46 46
47A script for generating ready-to-use .DLL and static .LIB files is included in 47A script for generating ready-to-use .DLL and static .LIB files is included in
48the source repository at 48the source repository at
49https://github.com/libressl-portable/portable/blob/master/dist-win.sh 49https://github.com/libressl/portable/blob/master/dist-win.sh
50 50
51This script uses mingw-w64 to build LibreSSL and then uses Visual Studio tools 51This script uses mingw-w64 to build LibreSSL and then uses Visual Studio tools
52to generate compatible library import files ready-to-use with Visual 52to generate compatible library import files ready-to-use with Visual
diff --git a/update.sh b/update.sh
index 1feca33..e73455e 100755
--- a/update.sh
+++ b/update.sh
@@ -7,7 +7,7 @@ openbsd_branch=`cat OPENBSD_BRANCH`
7echo "pulling upstream openbsd source" 7echo "pulling upstream openbsd source"
8if [ ! -d openbsd ]; then 8if [ ! -d openbsd ]; then
9 if [ -z "$LIBRESSL_GIT" ]; then 9 if [ -z "$LIBRESSL_GIT" ]; then
10 git clone https://github.com/libressl-portable/openbsd.git 10 git clone https://github.com/libressl/openbsd.git
11 else 11 else
12 git clone $LIBRESSL_GIT/openbsd 12 git clone $LIBRESSL_GIT/openbsd
13 fi 13 fi