Tomas Mraz [Fri, 22 Mar 2024 09:53:08 +0000 (10:53 +0100)]
Add 3.3 branch and remove obsolete ones in tools
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/tools/pull/185)
Tomas Mraz [Thu, 18 Jan 2024 13:44:13 +0000 (14:44 +0100)]
perf: Avoid taking too long time with high thread counts
We change the tests to perform the same number
of iterations regardless of the thread counts.
Although this raises the running time for small
number of threads, this avoids very long running
times for 100 or more threads.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/162)
Tomas Mraz [Thu, 20 Jul 2023 10:03:11 +0000 (12:03 +0200)]
perf/pemread.c: Divide per-thread iteration count by threadcount
Otherwise with larger number of threads it takes too long
to run.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/162)
Neil Horman [Thu, 18 Jan 2024 13:20:12 +0000 (08:20 -0500)]
update ghmerge to python3
using ghmerge currently creates errors for me, in the form of inability
to load various python packages, as fedora moved to python3 several
releases ago
propose updating the use of python to python3 here to support recent
distributions.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/176)
Tomas Mraz [Mon, 11 Sep 2023 14:06:41 +0000 (16:06 +0200)]
Update README and README.md depending on which exists
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/tools/pull/166)
Richard Levitte [Wed, 8 Nov 2023 06:48:15 +0000 (07:48 +0100)]
Add a note on where to find the QueryApp libraries
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/172)
James Muir [Thu, 23 Nov 2023 13:24:18 +0000 (08:24 -0500)]
fix typo
"copryight" -> "copyright"
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/173)
Tomas Mraz [Tue, 16 Jan 2024 14:59:01 +0000 (15:59 +0100)]
HOWTO-handle-security-issue.md: Various minor updates
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/174)
Neil Horman [Wed, 17 Jan 2024 18:34:56 +0000 (13:34 -0500)]
Allow for setting of extra cflags
When I build to run these tests under perf, I need to include a few
extra cflags (notably -rpath an -fno-omit-frame-pointer). They're not
generally needed, but it would be nice to be able to set them easily in
an environment.
Add CFLAGS and LDFLAGS support to allow for easy
configuration
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/175)
Hugo Landau [Tue, 7 Nov 2023 07:51:58 +0000 (07:51 +0000)]
Allow gitaddrev path to be customised via environment variable
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)
Hugo Landau [Tue, 7 Nov 2023 07:40:05 +0000 (07:40 +0000)]
ghmerge: Add support for technical policies
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)
Hugo Landau [Tue, 7 Nov 2023 07:38:09 +0000 (07:38 +0000)]
Make ghmerge compatible with Git worktrees
Git worktrees have .git be a file containing a string identifying the
location of the real .git directory. Thus -d will not match these
worktrees. Use -e instead.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)
Hugo Landau [Tue, 7 Nov 2023 07:37:55 +0000 (07:37 +0000)]
Fix shebang lines for NixOS compatibility
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/171)
Richard Levitte [Mon, 6 Nov 2023 08:28:42 +0000 (09:28 +0100)]
Move OpenSSL-Query from omc-tools
Fixes #134
Co-authored-by: Matthias St. Pierre <matthias.st.pierre@ncp-e.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/170)
Tomas Mraz [Mon, 30 Oct 2023 09:59:29 +0000 (10:59 +0100)]
Add 3.2 branch to pick-to-branch and opensslpull
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/169)
Dimitri Papadopoulos [Thu, 22 Jun 2023 07:48:15 +0000 (09:48 +0200)]
release-tools/do-copyright-year: Always update copyright year in README.md
The copyright in README.md is supposed to have global scope.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/159)
Richard Levitte [Fri, 19 May 2023 12:02:34 +0000 (14:02 +0200)]
Reorganize the release HOWTO
This splits up HOWTO-make-a-release.md into two new documents that reflect
the fact that *staging* and *publishing* a release are really two separate
things.
This also reflects that we're working towards full automation for staging
releases.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/145)
Pauli [Wed, 9 Aug 2023 02:51:13 +0000 (12:51 +1000)]
Add how to handle security issues document
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/165)
Matt Caswell [Tue, 11 Jul 2023 15:21:26 +0000 (16:21 +0100)]
Add a performance test for PEM_read_bio_PrivateKey()
We repeatedly attempt to load an RSA Private Key and measure performance.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/161)
Richard Levitte [Fri, 23 Jun 2023 07:58:40 +0000 (09:58 +0200)]
Enable a different announcement for premium releases
The basic data of what is considered premium and what is considered
public releases, a new bash function is added, std_release_type(), found in
release-tools/release-aux/release-data-fn.sh.
Along with this, the non-descript variable 'tag' is renamed to 'release_tag',
and a spelling error is corrected.
Fixes #157
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/160)
Richard Levitte [Tue, 30 May 2023 06:14:21 +0000 (08:14 +0200)]
release-tools/stage-release.sh: Update copyright year
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/155)
Richard Levitte [Tue, 30 May 2023 12:34:35 +0000 (14:34 +0200)]
release-tools/do-copyright-year: Do not commit the changes!
Leave it to the caller to do what they want with the changes.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/156)
Matt Caswell [Mon, 29 May 2023 10:17:06 +0000 (11:17 +0100)]
Add a performance test for OSSL_PROVIDER_do_all()
This tests calls the OSSL_PROVIDER_do_all() function repeatedly in a loop.
This function can be called directly by user code, but is also used during
the initialisation of an SSL_CTX to discover TLS capabilities from
providers (e.g. pluggable groups etc).
The underlying internal function ossl_provider_doall_activated() will
also be tested by this. That function is called during algorithm fetching
(if the algorithms have not yet been cached).
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/154)
Matt Caswell [Fri, 26 May 2023 09:50:25 +0000 (10:50 +0100)]
Add a performance test for X509_CTX_CTX_get1_issuer()
This test just call X509_STORE_CTX_get1_issuer() in a loop with an empty
store. This function is usually called as part of chain building during a
certificate verify operation.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/150)
Richard Levitte [Mon, 29 May 2023 09:38:05 +0000 (11:38 +0200)]
A few fixes for release-tools/stage-release.sh
Correcting these issues:
- The update branch and release branch were created each on different sides
of a 'next_release_state' call, which made them differ even though there
shouldn't be any difference (i.e. --branch was given or implied).
- Running 'do-copyright-year' was done after configuration, and may change
Configure, which means that the following 'make' call may reconfigure and
intentionally fail, causing release staging failure.
- In the metadata, the 'staging_update_branch' entry was set to the original
update branch.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/153)
Matt Caswell [Fri, 26 May 2023 14:24:54 +0000 (15:24 +0100)]
Add an RSA signing performance test
Unlike "speed" this performs RSA operations in parallel using threads
(as opposed to the -multi speed option which uses "fork").
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/152)
Matt Caswell [Wed, 24 May 2023 14:55:02 +0000 (15:55 +0100)]
Add a performance test for EVP_PKEY_new_raw_public_key_ex()
We add a performance test for repeatedly calling
EVP_PKEY_new_raw_public_key_ex(). Note this test does not support 1.1.1.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/149)
Matt Caswell [Wed, 24 May 2023 13:18:24 +0000 (14:18 +0100)]
Add a performance test for constructing an SSL and associated BIO objects
We repeatedly call SSL_new() and BIO_new() (followed by appropriate free
calls), for a specified number of threads.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/148)
Matt Caswell [Mon, 22 May 2023 16:02:19 +0000 (17:02 +0100)]
Add details about the handshake script to the README
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Mon, 22 May 2023 15:34:40 +0000 (16:34 +0100)]
Add a --terse option
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Wed, 17 May 2023 15:27:46 +0000 (16:27 +0100)]
Add a handshake performance test
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Wed, 17 May 2023 15:03:06 +0000 (16:03 +0100)]
Move some common code out of randbytes
We move some code out of the randbytes test into perflib so we can later
reuse it.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Wed, 17 May 2023 14:46:51 +0000 (15:46 +0100)]
Add a README for the performance testing tools
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Wed, 17 May 2023 14:19:26 +0000 (15:19 +0100)]
Add a clean target for the Makefile
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Tue, 16 May 2023 16:09:19 +0000 (17:09 +0100)]
Create a RAND_bytes() performance testing script
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Matt Caswell [Tue, 16 May 2023 15:04:06 +0000 (16:04 +0100)]
Add some performance testing tools
Initial commit to add some performance testing tools. We start by adapting
some code from the main line for standalone use.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/146)
Richard Levitte [Fri, 26 May 2023 11:06:08 +0000 (13:06 +0200)]
release-tools/do-copyright-year: Modify files with more care
Files were modified by running a simple in-place sed (i.e. 'sed -i').
This turns out to update the modification time on every file, even those
that remain unmodified.
The effect is that time stamps in a source directory become unreliable,
causing configdata.pm to be "mysteriously" older than (unmodified) files it
depends on, which causes a spurious reconfiguration when running 'make'
again.
To mediate, the loop is modified to take copies of the original files, run
an in-place sed on those, and only move them back to the original files if
there were any actual modifications. That should leave time stamps alone on
unmodified files.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/151)
Richard Levitte [Fri, 19 May 2023 09:33:59 +0000 (11:33 +0200)]
release-tools/stage-release.sh: Add a run of 'do-copyright-year'
We did this as a manual step when the release staging script was in another
repository.
Now that they are in the same repository (in the same directory, even!),
there's no reason not to run 'do-copyright-year' automatically.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/144)
Richard Levitte [Tue, 18 Apr 2023 13:58:48 +0000 (15:58 +0200)]
Include the original HEAD in the porcelain output
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 18 Apr 2023 08:17:58 +0000 (10:17 +0200)]
release-tools/stage-release.sh: Use 'type -p' and realpath to find $0
This allows the release-aux directory to be found, even when a symbolic
link to this script is used.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 18 Apr 2023 08:15:35 +0000 (10:15 +0200)]
release-tools/stage-release.sh: Add --unsigned
This allows staging to produce unsigned files, and to add an annotated
but unsigned tag. The signing can be done later, when promoting a staged
release to an actual release.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Mon, 17 Apr 2023 12:57:28 +0000 (14:57 +0200)]
release-tools/stage-release.sh: Add a metadata file among the release files
This file contains shell variable assignments with diverse data that may
serve other release scripts.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Mon, 17 Apr 2023 06:32:35 +0000 (08:32 +0200)]
Clarify that the release script only stages the release files
This renames release-tools/release.sh to release-tools/stage-release.sh,
and modifies the option --upload-address to --staging-address.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Fri, 14 Apr 2023 10:31:11 +0000 (12:31 +0200)]
release.sh: Add --clean-worktree, --branch_fmt and --tag-fmt
This needed quite a bit of rearrangement to make sense.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Fri, 14 Apr 2023 09:35:32 +0000 (11:35 +0200)]
release.sh: Also present the uploaded/to be uploaded files with --porcelain
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Fri, 14 Apr 2023 09:10:07 +0000 (11:10 +0200)]
release.sh: Add --quiet and --porcelain
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Mon, 3 Apr 2023 06:54:42 +0000 (08:54 +0200)]
When checking for make update changes, only check tracked files
Sometimes, 'make update' leaves behind files that aren't tracked, and this
shouldn't cause trying to add an extra commit. However, we only checked
with 'git status --porcelain', which does list untracked files. This can
cause release failure, so we add a few more options so git status doesn't
report on these files that should be ignored.
This also includes a documenting comment for a piece of the scripts that's
potentially confusing without the explanation.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Thu, 30 Mar 2023 11:53:51 +0000 (13:53 +0200)]
Adapt release-tools/release.sh for pre-3.0 versions
There are small differences, such as some make targets not existing,
the method for creating tarballs being different in 1.0.2, ...
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Thu, 30 Mar 2023 10:11:34 +0000 (12:11 +0200)]
Add an option to specify the upload address
Both local directory and several forms of SCP/SFTP addresses are supported.
For the SCP/SFTP form, it is always translated to be usable with SFTP.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 06:38:21 +0000 (08:38 +0200)]
Adapt documentation for the new release script, and clean up
release-tools/release.sh and associated files should now be a good enough
replacement of release-tools/mkrelease.pl and associated files.
Therefore, HOWTO-make-a-release.md is adapted to only refer to the new
script, and release-tools/mkrelease.pl and associated files are removed.
Someone might want to ask, why shell scripts rather than perl?
The reasoning is that the OpenSSL team does most if not all its development
on Unix-like systems, and the release script is essentially a wrapper around
diverse shell commands anyway, it therefore seems sensible to use the shell
language.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 05:46:32 +0000 (07:46 +0200)]
release-tools/release.sh et al: introduce RELEASE_FILES and use it
This is a variable that holds a list of files other than the version file,
that need to be touched up with release information. This variable is set
by the version functions, as the files are varied, depending on the versio
scheme and series.
We also add the fixup files for all possible release files.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 05:43:41 +0000 (07:43 +0200)]
release-tools/release.sh et al: introduce FULL_VERSION and use it
This is a convenience variable, combined from $VERSION, $_PRE_RELEASE_TAG
and $_BUILD_METADATA.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 05:19:59 +0000 (07:19 +0200)]
Adapt release-tools/release.sh for a life outside of the OpenSSL work tree
This makes use of the VERSION_FILE variable that is delivered by
release-tools/release-aux/release-version-fn.sh
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 05:15:04 +0000 (07:15 +0200)]
Adapt release-tools/release-aux/release-version-fn.sh for pre-3.0 versions
This also adds a test script release-tools/release-aux/test_suite.sh, to
check that all these functions behave as expected.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Tue, 28 Mar 2023 04:43:10 +0000 (06:43 +0200)]
release-tools/release-aux/ documentation updates and small fixes
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Richard Levitte [Fri, 24 Mar 2023 13:02:47 +0000 (14:02 +0100)]
Import openssl/openssl's dev/release.sh and accompanying files
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/140)
Matt Caswell [Thu, 23 Mar 2023 13:34:01 +0000 (13:34 +0000)]
Don't cross-post security advisories to oss-security
We should send any security advisory to oss-security separately and not
cross-post it with our own lists.
We also change the text to say that security advisories should be sent to
support-announce regardless of whether a premium release has been affected.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/139)
Tomas Mraz [Tue, 2 May 2023 18:44:11 +0000 (20:44 +0200)]
Add fuzz-corpora to review-tools
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/143)
Dr. David von Oheimb [Thu, 20 Apr 2023 13:07:02 +0000 (15:07 +0200)]
pick-to-branch: warn if target remote is not in github.openssl.org
Fixes #141
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/142)
Matt Caswell [Tue, 14 Mar 2023 14:25:55 +0000 (14:25 +0000)]
Update the release HOWTO following the 3.1 release
We now need to upload the release files to the "Releases" section of
github - so we update the HOWTO instructions accordingly.
This also fixes a minor error that was spotted during the release.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/128)
zengwei2000 [Wed, 22 Feb 2023 01:10:44 +0000 (01:10 +0000)]
Update README
CLA: trivial
fix typo
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/137)
Matt Caswell [Wed, 8 Feb 2023 11:14:56 +0000 (11:14 +0000)]
Add oss-security to the lists that receive advisory details
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/135)
Dr. David von Oheimb [Thu, 8 Dec 2022 10:31:44 +0000 (11:31 +0100)]
pick-to-branch: fix exit message by making variable name consistent
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/133)
Dr. David von Oheimb [Thu, 24 Nov 2022 21:28:28 +0000 (22:28 +0100)]
ghmerge: support handling conflicts on interactive rebase
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/132)
Richard Levitte [Fri, 21 Oct 2022 15:54:59 +0000 (17:54 +0200)]
Cover the premium release as well
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/130)
Richard Levitte [Fri, 21 Oct 2022 15:52:14 +0000 (17:52 +0200)]
Updates of things that have aged
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/130)
Richard Levitte [Wed, 26 Oct 2022 12:09:17 +0000 (14:09 +0200)]
review-tools/opensslpull: add 3.1
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/131)
Dr. David von Oheimb [Wed, 19 Oct 2022 18:34:04 +0000 (20:34 +0200)]
ghmerge: support handling conflicts on --cherry-pick
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/129)
Richard Levitte [Tue, 11 Oct 2022 07:20:41 +0000 (09:20 +0200)]
The command to freeze the repository isn't quite right, fix it
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/128)
Dr. David von Oheimb [Sat, 24 Sep 2022 15:34:55 +0000 (17:34 +0200)]
ghmerge and pick-to-branch: improve hints on how to handle conflicts
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/126)
Mark J. Cox [Mon, 14 Mar 2022 12:42:36 +0000 (12:42 +0000)]
3.0.0 is out so don't special case things as being deferred
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/127)
Dr. David von Oheimb [Tue, 8 Mar 2022 16:30:27 +0000 (17:30 +0100)]
gmerge and pick-to-branch: further tweak output
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/111)
Richard Levitte [Fri, 29 Jul 2022 11:38:13 +0000 (13:38 +0200)]
Modify mkrelease.pl to have a different announce text for premium releases
^CT-142 Closed
Richard Levitte [Fri, 10 Jun 2022 15:06:06 +0000 (17:06 +0200)]
HOWTO-make-a-release.md:take into account the moved secadv files
This includes vulnerabilities.xml and all of secadv/*
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/120)
Richard Levitte [Fri, 10 Jun 2022 06:11:31 +0000 (08:11 +0200)]
HOWTO-make-a-release.md: take into account the moved newsflash.txt
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/120)
Richard Levitte [Fri, 10 Jun 2022 05:35:46 +0000 (07:35 +0200)]
Update HOWTO-make-a-release.md to refer to OpenSSL's Github instance
openssl-git@git.openssl.org:openssl.git is no more.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/119)
Richard Levitte [Fri, 10 Jun 2022 05:01:20 +0000 (07:01 +0200)]
Drop release-tools/README.md
We have HOWTO-make-a-release.md, which is a more up to date version of
the same information.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/118)
Hugo Landau [Fri, 13 May 2022 12:42:59 +0000 (13:42 +0100)]
Update addrev to allow self-review on release
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/117)
Richard Levitte [Mon, 4 Apr 2022 19:38:30 +0000 (21:38 +0200)]
The web repo is governed by the OMC...
... and should therefore require a minimum of one OMC member reviewing.
In a similar vein, we also specify that the tools repo is governed by
the OTC.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/114)
Richard Levitte [Mon, 4 Apr 2022 19:37:19 +0000 (21:37 +0200)]
Depending on the repo, authors may still count as a reviewer
For the main repo, the author is never counted as a reviewer.
For the web and tools repos, the author is counted.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/114)
Hugo Landau [Tue, 26 Apr 2022 06:03:26 +0000 (07:03 +0100)]
Allow Release line to be added to all commits touched by addrev
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/web/pull/115)
Hugo Landau [Fri, 22 Apr 2022 13:46:16 +0000 (14:46 +0100)]
Support release review requirement bypass for 1.1.1/1.0.2
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/web/pull/115)
Tomas Mraz [Mon, 14 Mar 2022 14:22:39 +0000 (15:22 +0100)]
pick-to-branch: Allow fixing trivial conflicts when cherry-picking
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/110)
Mark J. Cox [Mon, 14 Mar 2022 11:09:50 +0000 (11:09 +0000)]
Add the tool for GH openssl-machine to ping and close stale PRs
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/108)
Matt Caswell [Tue, 8 Mar 2022 14:08:56 +0000 (14:08 +0000)]
Don't add the author to the unknown reviewers list
If the author is a known reviewer, don't add them to the unknown reviewers
list.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/107)
Tomas Mraz [Fri, 3 Dec 2021 11:51:56 +0000 (12:51 +0100)]
ghmerge: The default remote is on github.openssl.org
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/103)
Matt Caswell [Mon, 21 Feb 2022 11:34:35 +0000 (11:34 +0000)]
Don't let addrev count the author as a reviewer
As per the latest policy change the author is no longer counted as a
reviewer, so we ensure addrev disallows this.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/105)
Dr. David von Oheimb [Fri, 26 Nov 2021 14:14:52 +0000 (15:14 +0100)]
pick-to-branch: restrict 'git pull --ff-only' to target branch
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)
Dr. David von Oheimb [Fri, 26 Nov 2021 13:47:06 +0000 (14:47 +0100)]
pick-to-branch: allow 'h' or 'HEAD' as first argument, which leads to using the master HEAD
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)
Dr. David von Oheimb [Fri, 26 Nov 2021 13:34:01 +0000 (14:34 +0100)]
pick-to-branch: restore to original commit HEAD of target on error/abort
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)
Dr. David von Oheimb [Fri, 26 Nov 2021 11:04:39 +0000 (12:04 +0100)]
pick-to-branch: rename 'branch' to 'target' for clarity
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)
Dr. David von Oheimb [Fri, 26 Nov 2021 11:00:02 +0000 (12:00 +0100)]
pick-to-branch: improve user guidance and streamline interaction
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/101)
Dr. David von Oheimb [Fri, 26 Nov 2021 14:21:58 +0000 (15:21 +0100)]
ghmerge: support stopping rebase for adaptations
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/102)
Tomas Mraz [Mon, 22 Nov 2021 14:25:49 +0000 (15:25 +0100)]
pick-to-branch: Allow cherry-picking multiple commits at once
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/tools/pull/100)
Dr. David von Oheimb [Wed, 17 Nov 2021 13:38:19 +0000 (14:38 +0100)]
pick-to-branch: Improve fix of behavior on failed cherry-pick
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/99)
Dr. David von Oheimb [Mon, 8 Nov 2021 11:52:31 +0000 (12:52 +0100)]
pick-to-branch: make sure that local branch is up-to-date
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/98)
Dr. David von Oheimb [Mon, 8 Nov 2021 11:46:35 +0000 (12:46 +0100)]
pick-to-branch: revert cherry-pick if aborted by user
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/98)
Dr. David von Oheimb [Mon, 22 Nov 2021 12:37:50 +0000 (13:37 +0100)]
ghmerge: restore to original commit HEAD of target on error/abort
Also add an empty line before the git log output for readability.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)
Dr. David von Oheimb [Mon, 22 Nov 2021 11:52:44 +0000 (12:52 +0100)]
ghmerge: correct assignment to WORK_USED
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)
Dr. David von Oheimb [Mon, 22 Nov 2021 11:31:18 +0000 (12:31 +0100)]
ghmerge: Rename --ref to --target for clarity
We are keeping --ref for backward compat.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)