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)

diff --git a/review-tools/opensslpull b/review-tools/opensslpull
index 8bb6e2465684088570363f1b0c9c8caafc9e1c06..506935bb3a0cd23a04c12e82b2561c0785333448 100755 (executable)
--- a/review-tools/opensslpull
+++ b/review-tools/opensslpull
@@ -6,12 +6,10 @@ test -f ./config || {
     exit 1
 }
 
-git checkout --quiet OpenSSL_1_0_2-stable ; git pull --rebase
-git checkout --quiet OpenSSL_1_1_0-stable ; git pull --rebase
-git checkout --quiet OpenSSL_1_1_1-stable ; git pull --rebase
 git checkout --quiet openssl-3.0 ; git pull --rebase
 git checkout --quiet openssl-3.1 ; git pull --rebase
 git checkout --quiet openssl-3.2 ; git pull --rebase
+git checkout --quiet openssl-3.3 ; git pull --rebase
 git checkout --quiet master
 git rebase -p origin/master
 

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index 11d2de4c1aa68d75b6b1fe085407b36ffa81fa7a..9500e671a9af74472e08bfe947bfac4a7cf121c6 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -48,9 +48,6 @@ case $b in
 *1*0*2*)
     TARGET=OpenSSL_1_0_2-stable
     ;;
-*1*1*0*)
-    TARGET=OpenSSL_1_1_0-stable
-    ;;
 *1*1*1*)
     TARGET=OpenSSL_1_1_1-stable
     ;;
@@ -63,6 +60,9 @@ case $b in
 *3*2*)
     TARGET=openssl-3.2
     ;;
+*3*3*)
+    TARGET=openssl-3.3
+    ;;
 m*)
     TARGET=master
     ;;