summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2003-11-06 07:34:27 +0000
committerRobey Pointer <robey@lag.net>2003-11-06 07:34:27 +0000
commit14d7a745a7c42877545f2621459877da1c72a765 (patch)
tree4f9acf6a27bde4a1ecd7173422be88f327d6970e
parent3b9901a602085fdee66249b14f83c158864b5f33 (diff)
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-2]
add a demo host key and point demo-server at it. also, temporarily comment out the nonfunctional kex-gex method.
-rw-r--r--demo-host-key15
-rwxr-xr-xdemo-server.py2
-rw-r--r--transport.py3
3 files changed, 18 insertions, 2 deletions
diff --git a/demo-host-key b/demo-host-key
new file mode 100644
index 00000000..f50e9c53
--- /dev/null
+++ b/demo-host-key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWgIBAAKBgQDTj1bqB4WmayWNPB+8jVSYpZYk80Ujvj680pOTh2bORBjbIAyz
+oWGW+GUjzKxTiiPvVmxFgx5wdsFvF03v34lEVVhMpouqPAYQ15N37K/ir5XY+9m/
+d8ufMCkjeXsQkKqFbAlQcnWMCRnOoPHS3I4vi6hmnDDeeYTSRvfLbW0fhwIBIwKB
+gBIiOqZYaoqbeD9OS9z2K9KR2atlTxGxOJPXiP4ESqP3NVScWNwyZ3NXHpyrJLa0
+EbVtzsQhLn6rF+TzXnOlcipFvjsem3iYzCpuChfGQ6SovTcOjHV9z+hnpXvQ/fon
+soVRZY65wKnF7IAoUwTmJS9opqgrN6kRgCd3DASAMd1bAkEA96SBVWFt/fJBNJ9H
+tYnBKZGw0VeHOYmVYbvMSstssn8un+pQpUm9vlG/bp7Oxd/m+b9KWEh2xPfv6zqU
+avNwHwJBANqzGZa/EpzF4J8pGti7oIAPUIDGMtfIcmqNXVMckrmzQ2vTfqtkEZsA
+4rE1IERRyiJQx6EJsz21wJmGV9WJQ5kCQQDwkS0uXqVdFzgHO6S++tjmjYcxwr3g
+H0CoFYSgbddOT6miqRskOQF3DZVkJT3kyuBgU2zKygz52ukQZMqxCb1fAkASvuTv
+qfpH87Qq5kQhNKdbbwbmd2NxlNabazPijWuphGTdW0VfJdWfklyS2Kr+iqrs/5wV
+HhathJt636Eg7oIjAkA8ht3MQ+XSl9yIJIS8gVpbPxSw5OMfw0PjVE7tBdQruiSc
+nvuQES5C9BMHjF39LZiGH1iLQy7FgdHyoP+eodI7
+-----END RSA PRIVATE KEY-----
diff --git a/demo-server.py b/demo-server.py
index 6819ea92..1db02230 100755
--- a/demo-server.py
+++ b/demo-server.py
@@ -13,7 +13,7 @@ if len(l.handlers) == 0:
l.addHandler(lh)
host_key = secsh.RSAKey()
-host_key.read_private_key_file('/home/robey/sshkey/ssh_host_rsa_key')
+host_key.read_private_key_file('demo-host-key')
# now connect
try:
diff --git a/transport.py b/transport.py
index 9790f2b6..2020b279 100644
--- a/transport.py
+++ b/transport.py
@@ -80,7 +80,8 @@ class BaseTransport(threading.Thread):
preferred_ciphers = [ 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' ]
preferred_macs = [ 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' ]
preferred_keys = [ 'ssh-rsa', 'ssh-dss' ]
- preferred_kex = [ 'diffie-hellman-group1-sha1', 'diffie-hellman-group-exchange-sha1' ]
+ preferred_kex = [ 'diffie-hellman-group1-sha1' ]
+# preferred_kex = [ 'diffie-hellman-group1-sha1', 'diffie-hellman-group-exchange-sha1' ]
cipher_info = {
'blowfish-cbc': { 'class': Blowfish, 'mode': Blowfish.MODE_CBC, 'block-size': 8, 'key-size': 16 },