tools.git
2 years agopick-to-branch: Improve fix of behavior on failed cherry-pick
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)

2 years agopick-to-branch: make sure that local branch is up-to-date
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)

2 years agopick-to-branch: revert cherry-pick if aborted by user
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)

2 years agoghmerge: restore to original commit HEAD of target on error/abort
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)

2 years agoghmerge: correct assignment to WORK_USED
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)

2 years agoghmerge: Rename --ref to --target for clarity
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)

2 years agoghmerge: extend --cherry-pick with the number of commits to pick
Dr. David von Oheimb [Wed, 17 Nov 2021 13:14:36 +0000 (14:14 +0100)]
ghmerge: extend --cherry-pick with the number of commits to pick

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)

2 years agoghmerge: Fix behavior on failed cherry-pick, rebase, and pull
Dr. David von Oheimb [Mon, 25 Oct 2021 12:45:17 +0000 (14:45 +0200)]
ghmerge: Fix behavior on failed cherry-pick, rebase, and pull

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)

2 years agopick-to-branch: fix inferring the id from master branch
Tomas Mraz [Fri, 5 Nov 2021 15:51:50 +0000 (16:51 +0100)]
pick-to-branch: fix inferring the id from master branch

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/96)

2 years agoMake it more explicit how to push tags
Matt Caswell [Wed, 25 Aug 2021 08:46:14 +0000 (09:46 +0100)]
Make it more explicit how to push tags

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/90)

2 years agopick-to-branch: Further improve user guidance on commit id
Dr. David von Oheimb [Mon, 25 Oct 2021 08:01:19 +0000 (10:01 +0200)]
pick-to-branch: Further improve user guidance on commit id

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

2 years agopick-to-branch: Fix behavior on failed cherry-pick
Dr. David von Oheimb [Mon, 25 Oct 2021 07:47:18 +0000 (09:47 +0200)]
pick-to-branch: Fix 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/95)

2 years agopick-to-branch: Improve diagnostics on bad target branch
Dr. David von Oheimb [Mon, 25 Oct 2021 07:36:51 +0000 (09:36 +0200)]
pick-to-branch: Improve diagnostics on bad target branch

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

2 years agopick-to-branch: Fix the case that commit id is derived from HEAD of master
Dr. David von Oheimb [Sat, 23 Oct 2021 11:10:41 +0000 (13:10 +0200)]
pick-to-branch: Fix the case that commit id is derived from HEAD of master

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

2 years agopick-to-branch: Preserve current branch and its state if it is not the target
Dr. David von Oheimb [Sat, 23 Oct 2021 10:49:30 +0000 (12:49 +0200)]
pick-to-branch: Preserve current branch and its state if it is not the target

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

2 years agopick-to-branch: Improve user guidance
Dr. David von Oheimb [Sat, 23 Oct 2021 10:32:35 +0000 (12:32 +0200)]
pick-to-branch: Improve user guidance

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

2 years agoghmerge: Avoid checking out ref branch if not needed
Dr. David von Oheimb [Thu, 7 Oct 2021 14:00:40 +0000 (16:00 +0200)]
ghmerge: Avoid checking out ref branch if not needed

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/94)

2 years agoghmerge: Improve robustness and clarity regarding which ref branch is used
Dr. David von Oheimb [Thu, 7 Oct 2021 13:54:44 +0000 (15:54 +0200)]
ghmerge: Improve robustness and clarity regarding which ref branch is used

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/94)

2 years agoghmerge: Correct saving and restoring original state
Dr. David von Oheimb [Thu, 7 Oct 2021 13:43:21 +0000 (15:43 +0200)]
ghmerge: Correct saving and restoring original state

Also properly catch the error that copy-of-... already exists

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/94)

2 years agoRemove run-checker completely as it is not used anymore
Tomas Mraz [Thu, 2 Sep 2021 12:04:36 +0000 (14:04 +0200)]
Remove run-checker completely as it is not used anymore

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/93)

2 years agorun-checker: remove the fuzzing builds
Pauli [Fri, 27 Aug 2021 04:25:14 +0000 (14:25 +1000)]
run-checker: remove the fuzzing builds

Not to be merged until after openssl/openssl#16438 is merged and working.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/91)

2 years agoUpdate tools scripts to know about 3.0
Pauli [Tue, 31 Aug 2021 23:08:21 +0000 (09:08 +1000)]
Update tools scripts to know about 3.0

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/92)

2 years agoSend release emails from the owner of the signing key
Matt Caswell [Fri, 21 May 2021 09:18:18 +0000 (10:18 +0100)]
Send release emails from the owner of the signing key

Announcement emails should be sent from the email account of the owner of
the signing key, otherwise some email clients will fail to verify the key
correctly.

A longer term solution will be to have a separate release signing key.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/89)

3 years agorun-checker: reduce the number of builds
Pauli [Wed, 12 May 2021 01:25:35 +0000 (11:25 +1000)]
run-checker: reduce the number of builds

With the addition of most run-checker jobs to GitHub Actions, there is no need
to continue running these jobs ourselves.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/87)

3 years agorun-checker: add more builds with FIPS enabled and other disabled.
Pauli [Sat, 1 May 2021 03:47:11 +0000 (13:47 +1000)]
run-checker: add more builds with FIPS enabled and other disabled.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/85)

3 years agorun-checker: disable debug flag for builds
Pauli [Tue, 4 May 2021 08:14:32 +0000 (18:14 +1000)]
run-checker: disable debug flag for builds

It is more representative of reality.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/86)

3 years agoAdd additional run-checker no-XXX options.
Pauli [Thu, 29 Apr 2021 23:56:39 +0000 (09:56 +1000)]
Add additional run-checker no-XXX options.

There were a number of options missing:

    no-autoload-config
    no-buildtest-c++
    no-bulk
    no-cmp
    no-ktls
    no-module
    no-padlockeng
    no-pinshared
    no-secure-memory
    no-siv
    no-uplink
    enable-acvp-tests
    enable-fips
    enable-fips no-fips-securitychecks

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/84)

3 years agoghmerge: Rebase PR on top of master
Tomas Mraz [Wed, 28 Apr 2021 09:24:42 +0000 (11:24 +0200)]
ghmerge: Rebase PR on top of master

ghmerge rebased the newer commits from master on top of PR first
which does not do much sense. Do it the other way around.

Also allow fixing eventual trivial rebase conflicts in the
background.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/tools/pull/83)

3 years agorelease-tools: Separate do-release.pl docs from mkrelease.pl docs
Richard Levitte [Tue, 17 Nov 2020 10:28:23 +0000 (11:28 +0100)]
release-tools: Separate do-release.pl docs from mkrelease.pl docs

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/74)

3 years agoNew releasing instructions, HOWTO-make-a-release.md
Richard Levitte [Tue, 17 Nov 2020 10:53:30 +0000 (11:53 +0100)]
New releasing instructions, HOWTO-make-a-release.md

README.md in $TOOLS/release-tools/ isn't obvious to discover.  It has
also aged considerably, at least in terms of OpenSSL 3.0, so needs a
serious update.

Co-authored-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/75)

3 years agoAdd a run-checker job that uses the no-cached-fetch option.
Pauli [Wed, 10 Feb 2021 12:09:19 +0000 (22:09 +1000)]
Add a run-checker job that uses the no-cached-fetch option.

This cannot be merged until after #14126 is.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/82)

3 years agoaddrev: Silence the git filter-branch warning message
Tomas Mraz [Thu, 7 Jan 2021 09:01:04 +0000 (10:01 +0100)]
addrev: Silence the git filter-branch warning message

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/tools/pull/81)

3 years agoghmerge: Pass --tools and --web to addrev
Tomas Mraz [Tue, 8 Dec 2020 15:51:04 +0000 (16:51 +0100)]
ghmerge: Pass --tools and --web to addrev

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/tools/pull/80)

3 years agoAdd a check for no-legacy to run-checker
Matt Caswell [Wed, 2 Dec 2020 13:32:58 +0000 (13:32 +0000)]
Add a check for no-legacy to run-checker

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/tools/pull/78)

3 years agoaddrev: Remove tabs by space chars
Dr. David von Oheimb [Thu, 3 Dec 2020 12:59:25 +0000 (13:59 +0100)]
addrev: Remove tabs by space chars

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

3 years agoaddrev: Fix regression on parsing bare prnum; correct help output
Dr. David von Oheimb [Thu, 3 Dec 2020 11:55:19 +0000 (12:55 +0100)]
addrev: Fix regression on parsing bare prnum; correct help output

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

3 years agoghmerge: Make pulling the latest REMOTE/REF work als for non-default REF
Dr. David von Oheimb [Wed, 2 Dec 2020 16:22:14 +0000 (17:22 +0100)]
ghmerge: Make pulling the latest REMOTE/REF work als for non-default REF

This avoids potential git errors such as:

You asked to pull from the remote 'upstream', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

3 years agoghmerge: improve doc of --remote and --ref options
Dr. David von Oheimb [Thu, 19 Nov 2020 10:21:04 +0000 (11:21 +0100)]
ghmerge: improve doc of --remote and --ref options

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

3 years agoaddrev: re-enable use of singe-character review names
Dr. David von Oheimb [Thu, 19 Nov 2020 09:35:28 +0000 (10:35 +0100)]
addrev: re-enable use of singe-character review names

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/79)

3 years agoEnsure sanitizer builds use no-asm
Matt Caswell [Tue, 1 Dec 2020 14:49:50 +0000 (14:49 +0000)]
Ensure sanitizer builds use no-asm

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/77)

3 years agoFix regression from latest addrev change
Tomas Mraz [Wed, 18 Nov 2020 15:48:48 +0000 (16:48 +0100)]
Fix regression from latest addrev change

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/76)

3 years agoAdd a note about closing the github advisory
Matt Caswell [Tue, 21 Apr 2020 14:29:24 +0000 (15:29 +0100)]
Add a note about closing the github advisory

If we've used a private github fork then we should close the advisory
and fork after the release is done.

Reviewed-by: Mark J. Cox <mark@awe.com>
(Merged from https://github.com/openssl/tools/pull/65)

3 years ago[run-checker]: default to 4 parallel test jobs
Nicola Tuveri [Thu, 2 Jul 2020 14:25:56 +0000 (17:25 +0300)]
[run-checker]: default to 4 parallel test jobs

<https://github.com/openssl/openssl/pull/12326> added support for
running the tests in parallel. The default is still to run them
sequentially.

This alters run-checker so that it defaults to 4 test jobs in parallel,
which seems a safe assumption given we are already using 4 building
jobs.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/71)

3 years agoghmerge: Add --help option and significantly extend usage hints (describing options)
Dr. David von Oheimb [Sat, 14 Nov 2020 14:41:58 +0000 (15:41 +0100)]
ghmerge: Add --help option and significantly extend usage hints (describing options)

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Rename variable 'REL' to more telling 'REF'
Dr. David von Oheimb [Thu, 8 Oct 2020 11:32:17 +0000 (13:32 +0200)]
ghmerge: Rename variable 'REL' to more telling 'REF'

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Add --cherry-pick option (as alternative to rebase)
Dr. David von Oheimb [Thu, 8 Oct 2020 11:11:28 +0000 (13:11 +0200)]
ghmerge: Add --cherry-pick option (as alternative to rebase)

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Remove redundant and error-prone 2nd rebase on current ref
Dr. David von Oheimb [Thu, 8 Oct 2020 11:09:35 +0000 (13:09 +0200)]
ghmerge: Remove redundant and error-prone 2nd rebase on current ref

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Unify behavior on error in CLI arguments and improve usage output
Dr. David von Oheimb [Thu, 8 Oct 2020 11:02:29 +0000 (13:02 +0200)]
ghmerge: Unify behavior on error in CLI arguments and improve usage output

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Make sure that on build error all error output is shown and then the tool...
Dr. David von Oheimb [Thu, 8 Oct 2020 11:29:41 +0000 (13:29 +0200)]
ghmerge: Make sure that on build error all error output is shown and then the tool exits

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Move adaptation of CC variable and improve the comment about it
Dr. David von Oheimb [Thu, 8 Oct 2020 13:29:01 +0000 (15:29 +0200)]
ghmerge: Move adaptation of CC variable and improve the comment about it

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Automatically detect remote only if not explicitly given as option
Dr. David von Oheimb [Thu, 8 Oct 2020 13:38:58 +0000 (15:38 +0200)]
ghmerge: Automatically detect remote only if not explicitly given as option

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Improve flexibility providing reviewer names vs. commit refs (gitaddrev...
Dr. David von Oheimb [Thu, 8 Oct 2020 10:46:32 +0000 (12:46 +0200)]
ghmerge: Improve flexibility providing reviewer names vs. commit refs (gitaddrev filter args)

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Rename WORK branch that reflects the changes done by the PR
Dr. David von Oheimb [Thu, 8 Oct 2020 13:52:16 +0000 (15:52 +0200)]
ghmerge: Rename WORK branch that reflects the changes done by the PR

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Add --ref option to checkout given reference at first
Dr. David von Oheimb [Thu, 8 Oct 2020 07:43:00 +0000 (09:43 +0200)]
ghmerge: Add --ref option to checkout given reference at first

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Remove unused variable PREV
Dr. David von Oheimb [Thu, 8 Oct 2020 07:41:26 +0000 (09:41 +0200)]
ghmerge: Remove unused variable PREV

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Improve diagnostics on cleanup, distinguishing failure and non-error exit
Dr. David von Oheimb [Thu, 8 Oct 2020 07:39:47 +0000 (09:39 +0200)]
ghmerge: Improve diagnostics on cleanup, distinguishing failure and non-error exit

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoghmerge: Various small improvements on user interaction, extending messages etc.
Dr. David von Oheimb [Thu, 8 Oct 2020 07:37:02 +0000 (09:37 +0200)]
ghmerge: Various small improvements on user interaction, extending messages etc.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoaddrev: Add warning on overriding filter args
Dr. David von Oheimb [Thu, 8 Oct 2020 14:41:35 +0000 (16:41 +0200)]
addrev: Add warning on overriding filter args

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agoaddrev: Improve flexibility providing reviewer names vs. commit refs (filter args)
Dr. David von Oheimb [Thu, 8 Oct 2020 07:34:12 +0000 (09:34 +0200)]
addrev: Improve flexibility providing reviewer names vs. commit refs (filter args)

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/72)

3 years agorelease-tools/MKRELEASE.md: Add a note on suitability for OpenSSL 3.0
Richard Levitte [Fri, 13 Nov 2020 13:34:39 +0000 (14:34 +0100)]
release-tools/MKRELEASE.md: Add a note on suitability for OpenSSL 3.0

These release tools are not suitable for OpenSSL 3.0 and on, so we add
a note saying so.  release-tools/README.md will need to be retrofitted
for the release method used with OpenSSL 3.0.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/tools/pull/73)

3 years agoNIST DRBG test vector data file. Current 2020-06-09.
Pauli [Tue, 9 Jun 2020 01:48:49 +0000 (11:48 +1000)]
NIST DRBG test vector data file.  Current 2020-06-09.
Vectors are from:
    https://csrc.nist.gov/CSRC/media/Projects/Cryptographic-Algorithm-Validation-Program/documents/drbg/drbgtestvectors.zip

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/68)

3 years agorand-drbg: Add conversion script to create data for DRBG testing.
Pauli [Tue, 9 Jun 2020 01:46:59 +0000 (11:46 +1000)]
rand-drbg: Add conversion script to create data for DRBG testing.

NIST's DRBG test data set isn't ideal for evp_test to process.  This script
massages the data into a format which is more suitable.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/68)

3 years agoSimplify and generalize passing of addrev flags via ghmerge
Dr. David von Oheimb [Wed, 10 Jun 2020 09:35:23 +0000 (11:35 +0200)]
Simplify and generalize passing of addrev flags via ghmerge

3 years agoAdd usage/doc/help text on --trivial option of 'addrev'
Dr. David von Oheimb [Wed, 10 Jun 2020 09:34:11 +0000 (11:34 +0200)]
Add usage/doc/help text on --trivial option of 'addrev'

3 years agoMake opensslbuild faster by adding -j4 option to 'make test'
Dr. David von Oheimb [Sat, 6 Jun 2020 18:27:02 +0000 (20:27 +0200)]
Make opensslbuild faster by adding -j4 option to 'make test'

3 years agoSlightly improve user interaction of ghmerge
Dr. David von Oheimb [Sat, 6 Jun 2020 18:25:59 +0000 (20:25 +0200)]
Slightly improve user interaction of ghmerge

3 years agoImprove author matching for skipping author in list of reviewers in gitaddrev
Dr. David von Oheimb [Mon, 25 May 2020 19:10:54 +0000 (21:10 +0200)]
Improve author matching for skipping author in list of reviewers in gitaddrev

3 years agoAdd check of REMOTE and --verbose option to ghmerge
Dr. David von Oheimb [Mon, 25 May 2020 19:09:48 +0000 (21:09 +0200)]
Add check of REMOTE and --verbose option to ghmerge

4 years agoMove release-tools/do-release.pl to omc-tools
Richard Levitte [Thu, 23 Apr 2020 10:23:34 +0000 (12:23 +0200)]
Move release-tools/do-release.pl to omc-tools

This is an infrastructure tool rather than a developer tool.

4 years agoMove a set of directories to omc-tools, as per vote concluded 2020-03-04
Richard Levitte [Thu, 23 Apr 2020 09:26:23 +0000 (11:26 +0200)]
Move a set of directories to omc-tools, as per vote concluded 2020-03-04

These directories are moved:

OpenSSL-Query
QueryApp
clacheck
github-approve-label-workflow
license
reports

4 years agomake addrev exit with 1 in case of failure
Dr. David von Oheimb [Fri, 28 Feb 2020 03:02:20 +0000 (13:02 +1000)]
make addrev exit with 1 in case of failure

improve hint on using --prnum=... in review-tools/addrev

Various tweaks to make ghmerge more usable

- make gcc (rather than clang-3.6) the default for rebuilding
- take the (SSH version of the) repo URL from the database
- add 'git pull' to get the latest state of the master
- add '-i --autosquash' to 'git rebase' and move it before addrev
- make '--nomerge' (which means interactive rebase) the default
- show the log of the commits be pushed (after addrev is called)
- print some more (and slightly improved) info what is going on
- tweak the safety questions being asked

extend and update documentation of addrev etc. in review-tools/README

add info on HTTPS transfer done by (git)addrev and ghmerge
also on use of 'https_proxy' and 'no_proxy' env variables

* extend general description
* make clear that ghmerge calls addrev
* add description of the ghmerge options

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/59)

4 years agoDon't run the GOST engine test in a no-deprecated build
Matt Caswell [Wed, 5 Feb 2020 15:23:46 +0000 (15:23 +0000)]
Don't run the GOST engine test in a no-deprecated build

The GOST engine uses some deprecated symbols. Until that is resolved we
don't run the GOST engine test in a no deprecated build.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/tools/pull/54)

4 years agoadd missing dependency info to the Testing section of OpenSSL-Query/README.md
Dr. David von Oheimb [Tue, 11 Feb 2020 11:03:21 +0000 (12:03 +0100)]
add missing dependency info to the Testing section of OpenSSL-Query/README.md

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/58)

4 years agoallow simple copy&paste for the series of shell commands in OpenSSL-Query/README.md
Dr. David von Oheimb [Tue, 11 Feb 2020 11:01:31 +0000 (12:01 +0100)]
allow simple copy&paste for the series of shell commands in OpenSSL-Query/README.md

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/58)

4 years agoPRs are issues but let's be clear
Mark J. Cox [Fri, 7 Feb 2020 11:14:22 +0000 (11:14 +0000)]
PRs are issues but let's be clear

4 years agoAdd a notification when ready to merge
Mark J. Cox [Fri, 7 Feb 2020 11:00:40 +0000 (11:00 +0000)]
Add a notification when ready to merge
fixes #52

4 years agoRemove requirement of Python 3.7+ (just Python 3 is needed)
Mark J. Cox [Thu, 6 Feb 2020 09:29:24 +0000 (09:29 +0000)]
Remove requirement of Python 3.7+ (just Python  3 is needed)

4 years agoNeews python 3.7+ (or do a different date parser)
Mark J. Cox [Wed, 5 Feb 2020 11:22:24 +0000 (11:22 +0000)]
Neews python 3.7+ (or do a different date parser)

4 years agoStyle changes undo yapf blank lines, and fix typo function name
Mark J. Cox [Wed, 5 Feb 2020 11:20:25 +0000 (11:20 +0000)]
Style changes undo yapf blank lines, and fix typo function name

4 years agoAdd a tool for checking and changing labels
Mark J. Cox [Wed, 5 Feb 2020 10:49:33 +0000 (10:49 +0000)]
Add a tool for checking and changing labels

4 years agoApply OTC changes to gitaddrev
Nicola Tuveri [Sun, 5 Jan 2020 08:52:57 +0000 (10:52 +0200)]
Apply OTC changes to gitaddrev

After the changes in https://github.com/openssl/web/pull/146
`gitaddrev` (on which `addrev` depends) required an update to count OTC
approvals rather than OMC approvals.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/50)

4 years agoclacheck: rename 'need-cla' label to 'hold: cla required'
Dr. Matthias St. Pierre [Fri, 25 Oct 2019 22:45:17 +0000 (00:45 +0200)]
clacheck: rename 'need-cla' label to 'hold: cla required'

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/47)

4 years agocherry-checker: fix column alignment
Dr. Matthias St. Pierre [Thu, 3 Oct 2019 23:17:38 +0000 (01:17 +0200)]
cherry-checker: fix column alignment

Since GitHub pull request numbers went from 4-digit to 5-digit numbers,
the table output looked ragged. This commit fixes the alignment.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/44)

4 years agocherry-checker: fix: don't choke on semicolons in the commit message title
Dr. Matthias St. Pierre [Thu, 3 Oct 2019 21:34:14 +0000 (23:34 +0200)]
cherry-checker: fix: don't choke on semicolons in the commit message title

The semicolon is used as separator for the git output, so make sure
to stop the line.split() after the third separator, otherwise the
subject line might get split further.

(see openssl/openssl@bd01733fdd Fix comment; unchecked->checked)

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/43)

4 years agoFix enable-fuzz-afl builds in run-checker
Matt Caswell [Wed, 28 Aug 2019 16:33:47 +0000 (17:33 +0100)]
Fix enable-fuzz-afl builds in run-checker

We now require no-module for successful enable-fuzz-afl builds

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/42)

4 years agoAdd new ghlink tool
Dr. Matthias St. Pierre [Tue, 13 Aug 2019 23:24:55 +0000 (01:24 +0200)]
Add new ghlink tool

Usage:
      ghlink [<option>...] [<file>...]

    Concatenate the given file(s) to standard output, converting repository
    locations into GitHub links. If no file is given, read from stdin.

Options:
    --help
        Print a brief help message and exit.

    --man
        Print the manual page and exit.

    --markdown | -m
        Convert the locations to links in markdown syntax, with the location
        in square brackets, followed by the link in parentheses.

    --permanent | -p
        Always resolve branches to (unabbreviated) commit-ids for printing
        the link.

    --list | -l
        List only the links of all locations found, and omit the rest of the
        text. This option is useful together with the --permanent option to
        create GitHub permalinks, see EXAMPLES section below.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/40)

4 years agoQueryApp: enhance documentation of local installation via local::lib
Dr. Matthias St. Pierre [Thu, 1 Aug 2019 11:26:14 +0000 (13:26 +0200)]
QueryApp: enhance documentation of local installation via local::lib

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/39)

5 years agorun-checker: Check enabling and disabling trace
Richard Levitte [Thu, 14 Mar 2019 07:09:07 +0000 (08:09 +0100)]
run-checker: Check enabling and disabling trace

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/tools/pull/37)

5 years agoBN random range testing.
Pauli [Thu, 9 May 2019 10:02:46 +0000 (20:02 +1000)]
BN random range testing.

Add a script to generate critical value tables for the bn_rand_range stochastic
test.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/38)

5 years agorelease-tools/do-copyright-year: skip versioned directories
Richard Levitte [Tue, 20 Nov 2018 15:34:16 +0000 (16:34 +0100)]
release-tools/do-copyright-year: skip versioned directories

These are submodules, and we have no interest changing those.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/36)

5 years agorelease-tools/do-copyright-year: more efficient skip of D records
Richard Levitte [Tue, 20 Nov 2018 15:33:12 +0000 (16:33 +0100)]
release-tools/do-copyright-year: more efficient skip of D records

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/36)

5 years agorelease-tools/do-copyright-year: add a spinner+counter to show process
Richard Levitte [Tue, 20 Nov 2018 15:30:21 +0000 (16:30 +0100)]
release-tools/do-copyright-year: add a spinner+counter to show process

When a lot of changes has happened in a branch, processing all the
files can take some time, so this adds some visual progress feedback.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/tools/pull/36)

5 years agoadd dependencies to Makefile.PL
Pauli [Sun, 18 Nov 2018 05:59:41 +0000 (15:59 +1000)]
add dependencies to Makefile.PL

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/35)

5 years agoTool changes for Mac OS/X.
Pauli [Sun, 18 Nov 2018 00:06:32 +0000 (10:06 +1000)]
Tool changes for Mac OS/X.

Perl ends up with a different path when installed using _brew_.  The system perl
seems to have broken _cpan_ somehow.

Some additional packages need to be installed.

PATH also needs to be set so it can find the _plackup_ executable.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/35)

5 years agogitaddrev: don't lowercase the git author email address
Richard Levitte [Thu, 15 Nov 2018 23:55:11 +0000 (00:55 +0100)]
gitaddrev: don't lowercase the git author email address

That may lead to difficulties matching with the person database.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/tools/pull/34)

5 years agocherry-checker: add a 'fixes' column
Dr. Matthias St. Pierre [Wed, 24 Oct 2018 06:53:38 +0000 (08:53 +0200)]
cherry-checker: add a 'fixes' column

Scans the commit messages for 'Fixes' annotations and displays
them in an additional column.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/33)

5 years agoAdd 1.1.1 stable branch when doing 'opensslpull'
Paul Yang [Thu, 13 Sep 2018 01:24:17 +0000 (10:24 +0900)]
Add 1.1.1 stable branch when doing 'opensslpull'

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/31)

5 years agocherry-checker: initial commit
Dr. Matthias St. Pierre [Sun, 14 Oct 2018 12:05:09 +0000 (14:05 +0200)]
cherry-checker: initial commit

usage: cherry-checker [-h] [-a] [-s] [-r]

Shows the commits in 'master...OpenSSL_1_1_1-stable' which are eligible for
cherry-picking. A commit is considered cherry-picked, if there is another
commit on the "other side" which introduces an equivalent patch. For details,
see the documentation of the '--cherry-mark' option in the git-log(1) manpage.

optional arguments:
  -h, --help    show this help message and exit
  -a, --all     Show all commits, also those which have been cherry-picked.
  -s, --sort    Sort commits w.r.t. pull request number and author date.
  -r, --remote  Compare the remote branches instead of the local ones.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/32)

5 years agogitaddrev: do lowercase when checking CLA entries
Richard Levitte [Sat, 22 Sep 2018 21:06:18 +0000 (23:06 +0200)]
gitaddrev: do lowercase when checking CLA entries

We know that we lowercase all email addresses in the CLA database, so
we need to lowercase the identity that we use there, but nowhere else.

5 years agopick-to-branch: Update active branches
Bernd Edlinger [Wed, 12 Sep 2018 21:18:08 +0000 (07:18 +1000)]
pick-to-branch: Update active branches

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/30)