openssl
/
tools
mirror of https://github.com/openssl/tools
1
0
Fork 0
Code Issues Releases Wiki Activity
407 Commits 1 Branch 0 Tags 14 MiB
Commit Graph

407 Commits

Author SHA1 Message Date
Matt Caswell f96e99b2b9 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)
 2022-03-10 15:32:41 +00:00
Tomas Mraz 0334d8765e 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)
 2022-03-08 16:09:54 +01:00
Matt Caswell c4fbd27748 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)
 2022-02-28 11:26:39 +00:00
Dr. David von Oheimb b2ddb46e81 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)
 2021-12-03 12:44:27 +01:00
Dr. David von Oheimb 7f88b33177 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)
 2021-12-03 12:44:27 +01:00
Dr. David von Oheimb 123ff2acfd 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)
 2021-12-03 12:44:27 +01:00
Dr. David von Oheimb 9a224629fb 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)
 2021-12-03 12:44:27 +01:00
Dr. David von Oheimb 127f32ece7 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)
 2021-12-03 12:44:27 +01:00
Dr. David von Oheimb d2112b50c8 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)
 2021-11-26 15:21:58 +01:00
Tomas Mraz dbfd886b59 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)
 2021-11-26 10:50:00 +01:00
Dr. David von Oheimb be4668a589 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)
 2021-11-22 15:12:23 +01:00
Dr. David von Oheimb 744aefc2c8 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)
 2021-11-22 15:05:51 +01:00
Dr. David von Oheimb 3b4084c37a 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)
 2021-11-22 15:05:51 +01:00
Dr. David von Oheimb debabf50f5 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)
 2021-11-22 14:54:52 +01:00
Dr. David von Oheimb c728b5e389 ghmerge: correct assignment to WORK_USED 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)
 2021-11-22 14:54:46 +01:00
Dr. David von Oheimb 3bfc3b4bc4 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)
 2021-11-22 14:54:19 +01:00
Dr. David von Oheimb 41d7c0e63b 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)
 2021-11-22 14:52:01 +01:00
Dr. David von Oheimb 9ce7e5fb4e 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)
 2021-11-22 14:52:01 +01:00
Tomas Mraz b57692c1f0 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)
 2021-11-05 16:51:50 +01:00
Matt Caswell d9dd40cdad 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)
 2021-11-01 14:10:53 +01:00
Dr. David von Oheimb 4a5441d560 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)
 2021-11-01 14:08:21 +01:00
Dr. David von Oheimb 522710ebdd 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)
 2021-11-01 14:08:21 +01:00
Dr. David von Oheimb fb3ea4fea8 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)
 2021-11-01 14:08:21 +01:00
Dr. David von Oheimb f6ecc7fef0 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)
 2021-11-01 14:08:21 +01:00
Dr. David von Oheimb b92201c5a3 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)
 2021-11-01 14:08:21 +01:00
Dr. David von Oheimb e2c1ff33aa 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)
 2021-11-01 14:08:10 +01:00
Dr. David von Oheimb 3189d57539 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)
 2021-11-01 14:02:08 +01:00
Dr. David von Oheimb 485aa62c66 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)
 2021-11-01 14:02:08 +01:00
Dr. David von Oheimb 670fbf0eec 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)
 2021-11-01 14:02:08 +01:00
Tomas Mraz f6070cac86 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)
 2021-09-02 14:04:36 +02:00
Pauli 35717050e0 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)
 2021-09-02 14:02:36 +02:00
Pauli ed247a7778 Update tools scripts to know about 3.0 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/92)
 2021-09-01 09:08:21 +10:00
Matt Caswell f39ecd88bc 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)
 2021-06-03 15:45:05 +01:00
Pauli 0e935b5510 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)
 2021-05-12 11:25:35 +10:00
Pauli ca5cf74927 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)
 2021-05-06 10:51:37 +10:00
Pauli e771ebd4a0 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)
 2021-05-04 18:14:32 +10:00
Pauli fa7b4ef4e6 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)
 2021-04-30 12:20:18 +10:00
Tomas Mraz ee7da65b64 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)
 2021-04-30 09:06:43 +10:00
Richard Levitte 9d9c86fe44 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)
 2021-04-28 12:44:35 +02:00
Richard Levitte e1fc98e1c1 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)
 2021-02-19 10:32:53 +01:00
Pauli af3ebdeb6c 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)
 2021-02-10 22:12:26 +10:00
Tomas Mraz bd6c6f78c0 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)
 2021-01-07 10:01:04 +01:00
Tomas Mraz 51ba5bc2c1 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)
 2020-12-17 09:59:59 +01:00
Matt Caswell 6305ba8fde 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)
 2020-12-08 15:49:23 +00:00
Dr. David von Oheimb 7f0c30333c 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)
 2020-12-08 16:06:01 +01:00
Dr. David von Oheimb 67906aa385 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)
 2020-12-08 16:06:01 +01:00
Dr. David von Oheimb f9bb1cac3f 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)
 2020-12-08 16:06:01 +01:00
Dr. David von Oheimb 4ed0a292eb 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)
 2020-12-08 16:06:01 +01:00
Dr. David von Oheimb 3953ec2fe1 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)
 2020-12-08 16:06:01 +01:00
Matt Caswell 96a1953478 Ensure sanitizer builds use no-asm 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/77)
 2020-12-03 15:19:25 +00:00