From 23e45cac6e64a3c9e49c0623c7489b1894cd8794 Mon Sep 17 00:00:00 2001 From: Alexander Manalad Date: Tue, 22 Oct 2024 18:22:38 -0700 Subject: [PATCH 1/5] Fix RSA encryption bit size to 2048 --- .../jsch/internal/ui/preference/PreferencePage.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java index 71ad68b3ee5..61096cce5f6 100644 --- a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java +++ b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java @@ -497,7 +497,11 @@ else if(e.widget==keyGenerateRSA){ final JSchException[] _e=new JSchException[1]; BusyIndicator.showWhile(getShell().getDisplay(), () -> { try { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); + if (__type == KeyPair.RSA) { + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 2048); + } else { + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); + } } catch (JSchException e1) { _e[0] = e1; } @@ -508,7 +512,11 @@ else if(e.widget==keyGenerateRSA){ kpair=_kpair[0]; ByteArrayOutputStream out=new ByteArrayOutputStream(); - kpairComment=_type+"-1024"; //$NON-NLS-1$ + if (__type == KeyPair.RSA) { + kpairComment = _type + "-2048"; //$NON-NLS-1$ + } else { + kpairComment = _type + "-1024"; //$NON-NLS-1$ + } kpair.writePublicKey(out, kpairComment); out.close(); publicKeyText.setText(out.toString()); From 6b38790ccd62bc3782b33f0ed7e9ca27b1afc652 Mon Sep 17 00:00:00 2001 From: Alexander Manalad Date: Sat, 26 Oct 2024 16:46:11 -0700 Subject: [PATCH 2/5] Updated DSA and RSA encryption bit size separately. --- .../jsch/internal/ui/preference/PreferencePage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java index 61096cce5f6..4d2524baa95 100644 --- a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java +++ b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java @@ -498,9 +498,9 @@ else if(e.widget==keyGenerateRSA){ BusyIndicator.showWhile(getShell().getDisplay(), () -> { try { if (__type == KeyPair.RSA) { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 2048); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 4096); } else { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 3072); } } catch (JSchException e1) { _e[0] = e1; @@ -513,9 +513,9 @@ else if(e.widget==keyGenerateRSA){ ByteArrayOutputStream out=new ByteArrayOutputStream(); if (__type == KeyPair.RSA) { - kpairComment = _type + "-2048"; //$NON-NLS-1$ + kpairComment = _type + "-4096"; //$NON-NLS-1$ } else { - kpairComment = _type + "-1024"; //$NON-NLS-1$ + kpairComment = _type + "-3072"; //$NON-NLS-1$ } kpair.writePublicKey(out, kpairComment); out.close(); From 2fa34192c6dd2125e0991e247d70ba3727ae4b32 Mon Sep 17 00:00:00 2001 From: Alexander Manalad Date: Sat, 26 Oct 2024 17:01:39 -0700 Subject: [PATCH 3/5] Reverted merge changes. This reverts commit 64e43ebc5a5ee4469c2fb69a858e59ee23983943, reversing changes made to 6b38790ccd62bc3782b33f0ed7e9ca27b1afc652. The reason to revert merge changes is to let the workspace run correctly. --- .../preferences/AntEditorPreferencePage.java | 1 - .../preferences/AntRuntimePreferencePage.java | 1 - .../ui/preferences/TabFolderLayout.java | 57 ++++++++++++++++++ ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF | 4 +- .../org.eclipse.compare/META-INF/MANIFEST.MF | 2 +- .../internal/ComparePreferencePage.java | 1 - .../compare/internal/TabFolderLayout.java | 58 ++++++++++++++++++ .../org.eclipse.jsch.ui/META-INF/MANIFEST.MF | 2 +- .../ui/preference/PreferencePage.java | 8 +-- ua/org.eclipse.help.ui/META-INF/MANIFEST.MF | 2 +- .../internal/preferences/TabFolderLayout.java | 59 +++++++++++++++++++ 11 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java create mode 100644 team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java create mode 100644 ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TabFolderLayout.java diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java index c9cea96ff01..c605176a74b 100644 --- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java +++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntEditorPreferencePage.java @@ -48,7 +48,6 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.TabFolderLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java index 5828a9fbe1d..ec36b212051 100644 --- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java +++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntRuntimePreferencePage.java @@ -29,7 +29,6 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.TabFolderLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java new file mode 100644 index 00000000000..26daa30c91e --- /dev/null +++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2000, 2005 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.ant.internal.ui.preferences; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Layout; + +public class TabFolderLayout extends Layout { + + @Override + protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { + if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) + return new Point(wHint, hHint); + + Control[] children = composite.getChildren(); + int count = children.length; + int maxWidth = 0, maxHeight = 0; + for (int i = 0; i < count; i++) { + Control child = children[i]; + Point pt = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache); + maxWidth = Math.max(maxWidth, pt.x); + maxHeight = Math.max(maxHeight, pt.y); + } + + if (wHint != SWT.DEFAULT) + maxWidth = wHint; + if (hHint != SWT.DEFAULT) + maxHeight = hHint; + + return new Point(maxWidth, maxHeight); + + } + + @Override + protected void layout(Composite composite, boolean flushCache) { + Rectangle rect = composite.getClientArea(); + + for (Control element : composite.getChildren()) { + element.setBounds(rect); + } + } +} diff --git a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF index ee963e9d26b..5fd411d90ff 100644 --- a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF +++ b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true -Bundle-Version: 3.9.600.qualifier +Bundle-Version: 3.9.500.qualifier Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=op org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";resolution:=optional, org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";resolution:=optional, org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)";resolution:=optional, - org.eclipse.ui.editors;bundle-version="[3.19.0,4.0.0)";resolution:=optional, + org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";resolution:=optional, org.apache.ant;bundle-version="1.9.4", org.eclipse.ant.core;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)", diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index 512ee517236..13c9fc7d306 100644 --- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.19.0,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)", org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport, org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index 53fd4d2f6e0..c439ce98b6b 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -45,7 +45,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.TabFolderLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java new file mode 100644 index 00000000000..66dbc68c438 --- /dev/null +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2000, 2011 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.compare.internal; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Layout; + +public class TabFolderLayout extends Layout { + + @Override + protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { + if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) + return new Point(wHint, hHint); + + Control [] children = composite.getChildren (); + int count = children.length; + int maxWidth = 0, maxHeight = 0; + for (int i=0; i { try { if (__type == KeyPair.RSA) { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 4096); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 2048); } else { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 3072); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); } } catch (JSchException e1) { _e[0] = e1; @@ -513,9 +513,9 @@ else if(e.widget==keyGenerateRSA){ ByteArrayOutputStream out=new ByteArrayOutputStream(); if (__type == KeyPair.RSA) { - kpairComment = _type + "-4096"; //$NON-NLS-1$ + kpairComment = _type + "-2048"; //$NON-NLS-1$ } else { - kpairComment = _type + "-3072"; //$NON-NLS-1$ + kpairComment = _type + "-1024"; //$NON-NLS-1$ } kpair.writePublicKey(out, kpairComment); out.close(); diff --git a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF index 895d91bcde4..59d53f3a98e 100644 --- a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF +++ b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Export-Package: org.eclipse.help.ui, org.eclipse.help.ui.internal.util;x-friends:="org.eclipse.ua.tests", org.eclipse.help.ui.internal.views;x-friends:="org.eclipse.ui.cheatsheets,org.eclipse.ua.tests" Require-Bundle: org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.ui;bundle-version="[3.206.200,4.0.0)";visibility:=reexport, + org.eclipse.ui;bundle-version="[3.206.0,4.0.0)";visibility:=reexport, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)";visibility:=reexport, org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TabFolderLayout.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TabFolderLayout.java new file mode 100644 index 00000000000..72003fead1e --- /dev/null +++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TabFolderLayout.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2008, 2016 IBM Corporation and others. + * + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.help.ui.internal.preferences; + + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Layout; + +public class TabFolderLayout extends Layout { + + @Override + protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { + if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) + return new Point(wHint, hHint); + + Control [] children = composite.getChildren (); + int count = children.length; + int maxWidth = 0, maxHeight = 0; + for (int i=0; i Date: Sat, 26 Oct 2024 18:09:26 -0700 Subject: [PATCH 4/5] Update DSA and RSA encryption separately --- .../jsch/internal/ui/preference/PreferencePage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java index 61096cce5f6..4d2524baa95 100644 --- a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java +++ b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java @@ -498,9 +498,9 @@ else if(e.widget==keyGenerateRSA){ BusyIndicator.showWhile(getShell().getDisplay(), () -> { try { if (__type == KeyPair.RSA) { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 2048); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 4096); } else { - _kpair[0] = KeyPair.genKeyPair(getJSch(), __type); + _kpair[0] = KeyPair.genKeyPair(getJSch(), __type, 3072); } } catch (JSchException e1) { _e[0] = e1; @@ -513,9 +513,9 @@ else if(e.widget==keyGenerateRSA){ ByteArrayOutputStream out=new ByteArrayOutputStream(); if (__type == KeyPair.RSA) { - kpairComment = _type + "-2048"; //$NON-NLS-1$ + kpairComment = _type + "-4096"; //$NON-NLS-1$ } else { - kpairComment = _type + "-1024"; //$NON-NLS-1$ + kpairComment = _type + "-3072"; //$NON-NLS-1$ } kpair.writePublicKey(out, kpairComment); out.close(); From d905cd2ea9c2429d317991e1930ec2f9d7eb4ca1 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Sun, 27 Oct 2024 01:16:20 +0000 Subject: [PATCH 5/5] Version bump(s) for 4.34 stream --- ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF | 2 +- team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF index 5fd411d90ff..35363f174ad 100644 --- a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF +++ b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true -Bundle-Version: 3.9.500.qualifier +Bundle-Version: 3.9.600.qualifier Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF index 30141699d37..c5bccee1930 100644 --- a/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jsch.ui;singleton:=true -Bundle-Version: 1.5.400.qualifier +Bundle-Version: 1.5.500.qualifier Bundle-Activator: org.eclipse.jsch.internal.ui.JSchUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin