Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SSH] Added key size selection #1608

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SSH] Added key size selection #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ public class Messages extends NLS{
public static String CVSSSH2PreferencePage_145;
public static String CVSSSH2PreferencePage_146;
public static String CVSSSH2PreferencePage_147;
public static String CVSSSH2PreferencePage_148;
public static String KeyboardInteractiveDialog_0;
public static String KeyboardInteractiveDialog_1;
public static String KeyboardInteractiveDialog_2;
Expand Down
1 change: 1 addition & 0 deletions team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ CVSSSH2PreferencePage_144=Key Exchange &Methods
CVSSSH2PreferencePage_145=MA&C Methods
CVSSSH2PreferencePage_146=&SSH Agent
CVSSSH2PreferencePage_147=Select preferred SSH Agent
CVSSSH2PreferencePage_148=Key size:
UserInfoPrompter_0=SSH2 Message
UserInfoPrompter_1=SSH2 Message
KeyboardInteractiveDialog_0=Keyboard Interactive authentication for {0}: {1}
Expand Down
23 changes: 20 additions & 3 deletions ...ndles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
Expand All @@ -66,6 +67,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
Expand All @@ -89,8 +91,11 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage
implements IWorkbenchPreferencePage{

private static final String SSH2_PREFERENCE_PAGE_CONTEXT="org.eclipse.jsch.ui.ssh2_preference_page_context"; //$NON-NLS-1$
private static final int RSA_KEY_SIZE = 4096;
private static final int DSA_KEY_SIZE = 3072;
private static final int RSA_MAX_KEY_SIZE = 15360;
private static final int DSA_MAX_KEY_SIZE = 3072;
private static final int INITIAL_KEY_SIZE = 4096;
private static final int MIN_KEY_SIZE = 2048;
private static final int KEY_SIZE_INCREMENT = 1024;

private Label ssh2HomeLabel;
private Label privateKeyLabel;
Expand All @@ -101,6 +106,7 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage
private Button ssh2HomeBrowse;
Button keyGenerateDSA;
Button keyGenerateRSA;
private Spinner keySizeValue;
private Button keyLoad;
private Button keyExport;
Button saveKeyPair;
Expand Down Expand Up @@ -305,6 +311,13 @@ private Control createKeyManagementPage(Composite parent){
gd.horizontalSpan=1;
keyLoad.setLayoutData(gd);

final Label keySizeValueLabel = new Label(group, SWT.NONE);
keySizeValueLabel.setText(Messages.CVSSSH2PreferencePage_148);
keySizeValue = new Spinner(group, SWT.BORDER);
int maxKeySize = Math.max(DSA_MAX_KEY_SIZE, RSA_MAX_KEY_SIZE);
keySizeValue.setValues(INITIAL_KEY_SIZE, MIN_KEY_SIZE, maxKeySize, 0, KEY_SIZE_INCREMENT, KEY_SIZE_INCREMENT);
keySizeValue.addKeyListener(KeyListener.keyPressedAdapter(e -> e.doit = false));

publicKeylabel=new Label(group, SWT.NONE);
publicKeylabel.setText(Messages.CVSSSH2PreferencePage_39);
gd=new GridData();
Expand Down Expand Up @@ -485,18 +498,22 @@ public void widgetSelected(SelectionEvent e){
if(e.widget==keyGenerateDSA){
type=KeyPair.DSA;
_type=IConstants.DSA;
if (keySizeValue.getSelection() > DSA_MAX_KEY_SIZE) {
keySizeValue.setSelection(DSA_MAX_KEY_SIZE);
}
}
else if(e.widget==keyGenerateRSA){
type=KeyPair.RSA;
_type=IConstants.RSA;
}
// TODO: ECDSA
else{
return;
}

final KeyPair[] _kpair=new KeyPair[1];
final int __type=type;
int keySize = type == KeyPair.RSA ? RSA_KEY_SIZE : DSA_KEY_SIZE;
int keySize = keySizeValue.getSelection();
final JSchException[] _e=new JSchException[1];
BusyIndicator.showWhile(getShell().getDisplay(), () -> {
try {
Expand Down
Loading