Add openssl files compiled against new openssl 1.0.1h

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
github · Jul 25, 2014 · d4b16cb · d4b16cb
1 parent f4783d2
commit d4b16cb
Show file tree

Hide file tree

Showing 30 changed files with 77 additions and 46 deletions.
diff --git a/bin/scp.exe b/bin/scp.exe
diff --git a/bin/sftp.exe b/bin/sftp.exe
diff --git a/bin/slogin.exe b/bin/slogin.exe
diff --git a/bin/ssh-add.exe b/bin/ssh-add.exe
diff --git a/bin/ssh-agent.exe b/bin/ssh-agent.exe
diff --git a/bin/ssh-keygen.exe b/bin/ssh-keygen.exe
diff --git a/bin/ssh-keyscan.exe b/bin/ssh-keyscan.exe
diff --git a/bin/ssh.exe b/bin/ssh.exe
diff --git a/etc/ssh/ssh_host_dsa_key b/etc/ssh/ssh_host_dsa_key
@@ -1,12 +1,12 @@
 -----BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQCWcpmcXiTzIaLo0oqGqr3Cq9R4Ca1fsdAkXHK3xrcg88m2EPgX
-fbpL/xTjSrpP5w3qKsn26HmRa8VptN0dgd6tGkeh/VDai7c0/PN5vlbEt+XVnTG5
-2SKtIbFIGVSjpOnihFMN22rAA3pcL9HzJFtmvnzM5EtyzMlT2DWuTEC0vwIVAItF
-vJTTewyz3pArS8wFLyxnU+PrAoGBAI/5PTXKmJEtcUuYS9aac5PfCt/nh/sYJHS8
-kdVjFMO3vMxC8Bv6VdD2rircvUro7M5FMOIV4MbvsHOpGQjXcRRfKT1l/5lUw7wU
-xlK4mMTIg09RnzrJGnOFTClm68Q7+etmq0M+Ffkj5CHW2kDcO4YSLY0uEztsU/Bf
-jUbtmDHrAoGAOg9YlUmREzutFaUBA18P3nHf3bvugG2ASBqXdss1X+8jLITBWQWh
-hCBX3tT1NpXftVCEUt/gsYbUooTXjsMXGIcwT0gKgXWTeY5C/nXaX9H1tlW/my4u
-OQxuHCSAPLWYwlpaP+ERwm2sztgouwVA3V97sQ/kH38/IktJl3Z4lEwCFFeYMWYq
-eIixe8dq5gfJUvIqXWxp
+MIIBuwIBAAKBgQCpVNg0NcMS5lthQOun7J6sRI4zkAy7vE/2EG90cxe/Xx4tRLbA
+zgyH+FRMYa6UIptwX59Uck5n/IcsV1NSBVY6Y0cnKo4IXujfHf2hkrIoj1mRoZmR
+ThBSE1MgUfxOTyRG8L7j3VysRaZVHbr7bWtNe+wtir1lNEPytcAj0IjLJQIVAK09
+/FJVl2r++dc+b+g67h3JkVQBAoGAA/J/nIAjP4wI30zsVVSLA1M3HRvuAXwgRHP3
+00q8CqjYGwPhfdJSKUZhIRsBfPZAGH+sKDnxGoxmP2sDwD2LZgsXMHZ7QGAj5jWf
+2OnBfDCyTvxkpW5+FPOw6fIeVLFdVYpuTyqrFyvyxL47WYLPeWAKkxzq9e+R/41V
+bOvM13YCgYAh2pLenJz1yBvB3JntdRsqj/hrbhH4hoGZkZSQSniQsQD5BepVpYuq
+pSRFmq5TUZwud0pG5drHmHC0vzHrpkI7apDD1TWjRYO8OSgJ5iOU5EByg7vJ0dIh
+vb/Am/KunN4hsYumGA9KeUr5pHUTAf6E+eLhtwaQcpeTHTpRvFlfKQIVAKqG/3Ub
+Ul7mp3lEPZvboK43ieWa
 -----END DSA PRIVATE KEY-----
diff --git a/etc/ssh/ssh_host_dsa_key.pub b/etc/ssh/ssh_host_dsa_key.pub
@@ -1 +1 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBAJZymZxeJPMhoujSioaqvcKr1HgJrV+x0CRccrfGtyDzybYQ+Bd9ukv/FONKuk/nDeoqyfboeZFrxWm03R2B3q0aR6H9UNqLtzT883m+VsS35dWdMbnZIq0hsUgZVKOk6eKEUw3basADelwv0fMkW2a+fMzkS3LMyVPYNa5MQLS/AAAAFQCLRbyU03sMs96QK0vMBS8sZ1Pj6wAAAIEAj/k9NcqYkS1xS5hL1ppzk98K3+eH+xgkdLyR1WMUw7e8zELwG/pV0PauKty9SujszkUw4hXgxu+wc6kZCNdxFF8pPWX/mVTDvBTGUriYxMiDT1GfOskac4VMKWbrxDv562arQz4V+SPkIdbaQNw7hhItjS4TO2xT8F+NRu2YMesAAACAOg9YlUmREzutFaUBA18P3nHf3bvugG2ASBqXdss1X+8jLITBWQWhhCBX3tT1NpXftVCEUt/gsYbUooTXjsMXGIcwT0gKgXWTeY5C/nXaX9H1tlW/my4uOQxuHCSAPLWYwlpaP+ERwm2sztgouwVA3V97sQ/kH38/IktJl3Z4lEw= VirtualBox@VIRTUALBOX-PC
+ssh-dss AAAAB3NzaC1kc3MAAACBAKlU2DQ1wxLmW2FA66fsnqxEjjOQDLu8T/YQb3RzF79fHi1EtsDODIf4VExhrpQim3Bfn1RyTmf8hyxXU1IFVjpjRycqjghe6N8d/aGSsiiPWZGhmZFOEFITUyBR/E5PJEbwvuPdXKxFplUduvtta0177C2KvWU0Q/K1wCPQiMslAAAAFQCtPfxSVZdq/vnXPm/oOu4dyZFUAQAAAIAD8n+cgCM/jAjfTOxVVIsDUzcdG+4BfCBEc/fTSrwKqNgbA+F90lIpRmEhGwF89kAYf6woOfEajGY/awPAPYtmCxcwdntAYCPmNZ/Y6cF8MLJO/GSlbn4U87Dp8h5UsV1Vim5PKqsXK/LEvjtZgs95YAqTHOr175H/jVVs68zXdgAAAIAh2pLenJz1yBvB3JntdRsqj/hrbhH4hoGZkZSQSniQsQD5BepVpYuqpSRFmq5TUZwud0pG5drHmHC0vzHrpkI7apDD1TWjRYO8OSgJ5iOU5EByg7vJ0dIhvb/Am/KunN4hsYumGA9KeUr5pHUTAf6E+eLhtwaQcpeTHTpRvFlfKQ== thomas@THOMAS-WIN7-X64
diff --git a/etc/ssh/ssh_host_ecdsa_key b/etc/ssh/ssh_host_ecdsa_key
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPK+l5CvkO3weIbhKuDphHS78uKwvHqZDbBw1+H85jmPoAoGCCqGSM49
+AwEHoUQDQgAEDkpGKsggJr1fRyJN5gmd1xJYPuIDUkjMfKELyazZB/RQkU514EYl
+d+7YcmRKObgvXNmhwgY03BoPR57ZIxvP1w==
+-----END EC PRIVATE KEY-----
diff --git a/etc/ssh/ssh_host_ecdsa_key.pub b/etc/ssh/ssh_host_ecdsa_key.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA5KRirIICa9X0ciTeYJndcSWD7iA1JIzHyhC8ms2Qf0UJFOdeBGJXfu2HJkSjm4L1zZocIGNNwaD0ee2SMbz9c= thomas@THOMAS-WIN7-X64
diff --git a/etc/ssh/ssh_host_ed25519_key b/etc/ssh/ssh_host_ed25519_key
@@ -1,7 +1,7 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACAA+HqBD2pNi808KlLs8i50f/IF3bgEIZc0UzXpwNbQzwAAAKDjukKF47pC
-hQAAAAtzc2gtZWQyNTUxOQAAACAA+HqBD2pNi808KlLs8i50f/IF3bgEIZc0UzXpwNbQzw
-AAAEBsDabyJY4hSIPdjS3O4bDDENpuNR3skFWZGEnB1fSe/QD4eoEPak2LzTwqUuzyLnR/
-8gXduAQhlzRTNenA1tDPAAAAGFZpcnR1YWxCb3hAVklSVFVBTEJPWC1QQwECAwQF
+QyNTUxOQAAACAMitDklGP8UIIoebf7qNlTwPq5MOmzctyeKRUuFRFIvQAAAKCG+eZ8hvnm
+fAAAAAtzc2gtZWQyNTUxOQAAACAMitDklGP8UIIoebf7qNlTwPq5MOmzctyeKRUuFRFIvQ
+AAAEDhQAWy8kPpBvJaUfPW6Xwkrg9qU6neYkfKS8gCkD+CVAyK0OSUY/xQgih5t/uo2VPA
++rkw6bNy3J4pFS4VEUi9AAAAFnRob21hc0BUSE9NQVMtV0lONy1YNjQBAgMEBQYH
 -----END OPENSSH PRIVATE KEY-----
diff --git a/etc/ssh/ssh_host_ed25519_key.pub b/etc/ssh/ssh_host_ed25519_key.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAD4eoEPak2LzTwqUuzyLnR/8gXduAQhlzRTNenA1tDP VirtualBox@VIRTUALBOX-PC
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAyK0OSUY/xQgih5t/uo2VPA+rkw6bNy3J4pFS4VEUi9 thomas@THOMAS-WIN7-X64
diff --git a/etc/ssh/ssh_host_key b/etc/ssh/ssh_host_key
diff --git a/etc/ssh/ssh_host_key.pub b/etc/ssh/ssh_host_key.pub
@@ -1 +1 @@
-2048 65537 25200515115415124454874818234133006971111601224253414467108322839854701298977653656812223190771164269388131352443234514847320458676164814616353762589577688346035616119433976996274850308102408324485962707266052736238905584592547822682001862992422518008716819798282216918910536416067136969438019376347087685090006720022586848038870549194894539869693263590344322581223036313458009522268344904531829099181544167066673843300573175784159629558750621737651800130176214837634945602889677649930015395490488001367874469438988815003570905485960237907021071532469558911417330924894013669316684589535016602717154911231086691475853 VirtualBox@VIRTUALBOX-PC
+2048 65537 24148514455187152751707650651410576658770746563930144017669334092409708042905969062477584545022770851141174193495736448538212791369954946608558154561090975299485167070506395384198435423764840512139956523845039448129422356283385404899532353334981180507862155650978034760515086631515888079929185461634782685533853084203582558808513017153164975717232784067080805950756332974473737291003700180745208165103277985837693004377903410338969530178179665341390426192271569263429455106494149158734263129697602323078407712338289837521143885362742292533774798179761043378331279331946387862687519893953114650007807977111801988146767 thomas@THOMAS-WIN7-X64
diff --git a/etc/ssh/ssh_host_rsa_key b/etc/ssh/ssh_host_rsa_key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/etc/ssh/ssh_host_rsa_key.pub b/etc/ssh/ssh_host_rsa_key.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMjNJ7CdolQTfx8EavWsdyFyhYsqjgPFQkN0nxT65tJX/4kgmEjgxA24DRAivGDpYv5T4TYlfzVEyO7whdJ0gpSh1I88FV+NyABnnxOqqNjqQfcJhJjn/2jHr+7uexyj3H33mGwbUdU1JnkToSMajXBIeR/bcFKn/v3qBGQ8l0bNlzUdoQzG/SkjZatPjp7CYDwyJy65+/iW3n70XTHjLcPVN9W/LqmJlRwnHfGIYiPN223qBHdmjwRqx3x7bKmj2h/arfCPztojUXeisfwPIqVsw5ae/qWYtjE1Rnm/RgPV4AsdyoYhj37DiGALqEL97xrk+NJdoWaOeoh/jEPjrJ VirtualBox@VIRTUALBOX-PC
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJP250EQDMMVanRSNDUeVCEUHZH8e2mKxJxwt0GAjwFdTW7jJGsVmfc+cKrIz8zLARvP8Yb0ichK4MnBw6j33/XuyUqCuRr/YFuoy188bEJuT5hkY6+yLTdhVMx1WzBjNHboNu4VkIS8e60Npcxa8xWPwqv72QmrFWC40s9R2r7dtRgH0FKhZIyJW6pY1GxmDUe4TWB12nAhCCVjYeNwSkav4Vf8ZxeBJQVMzNdRU0rhFRw8tuOe63P0UcynBn7VTY3oMRoz31FHS+GtcDvb3WEZizBWjWKQ/0WpyvZo4PDFd4+6/82CRBnKfwqRQ3sKhpaCPHxgaAYfRn0LZKc5NR thomas@THOMAS-WIN7-X64
diff --git a/lib/libcrypto.dll.a b/lib/libcrypto.dll.a
diff --git a/lib/libminires.dll.a b/lib/libminires.dll.a
diff --git a/lib/textreadmode.o b/lib/textreadmode.o
diff --git a/libexec/sftp-server.exe b/libexec/sftp-server.exe
diff --git a/libexec/ssh-keysign.exe b/libexec/ssh-keysign.exe
diff --git a/libexec/ssh-pkcs11-helper.exe b/libexec/ssh-pkcs11-helper.exe
diff --git a/sbin/sshd.exe b/sbin/sshd.exe
diff --git a/share/man/man1/ssh-keyscan.1 b/share/man/man1/ssh-keyscan.1
@@ -132,6 +132,9 @@ host-or-namelist keytype base64-encoded-key
 Where
 \fIkeytype\fP
 is either
+``ecdsa-sha2-nistp256'',
+``ecdsa-sha2-nistp384'',
+``ecdsa-sha2-nistp521'',
 ``ssh-ed25519'',
 ``ssh-dss''
 or

diff --git a/share/man/man5/ssh_config.5 b/share/man/man5/ssh_config.5
@@ -324,6 +324,8 @@ The supported ciphers are:
 ``aes128-ctr'',
 ``aes192-ctr'',
 ``aes256-ctr'',
+``aes128-gcm@openssh.com'',
+``aes256-gcm@openssh.com'',
 ``arcfour128'',
 ``arcfour256'',
 ``arcfour'',
@@ -336,6 +338,8 @@ The default is:
 
 aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,
 .br
+aes128-gcm@openssh.com,aes256-gcm@openssh.com,
+.br
 chacha20-poly1305@openssh.com,
 .br
 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,
@@ -717,12 +721,20 @@ Specifies the protocol version 2 host key algorithms
 that the client wants to use in order of preference.
 The default for this option is:
 
+ecdsa-sha2-nistp256-cert-v01@openssh.com,
+.br
+ecdsa-sha2-nistp384-cert-v01@openssh.com,
+.br
+ecdsa-sha2-nistp521-cert-v01@openssh.com,
+.br
 ssh-ed25519-cert-v01@openssh.com,
 .br
 ssh-rsa-cert-v01@openssh.com,ssh-dss-cert-v01@openssh.com,
 .br
 ssh-rsa-cert-v00@openssh.com,ssh-dss-cert-v00@openssh.com,
 .br
+ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,
+.br
 ssh-ed25519,ssh-rsa,ssh-dss
 .br
 
@@ -896,6 +908,8 @@ The default is:
 
 curve25519-sha256@libssh.org,
 .br
+ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+.br
 diffie-hellman-group-exchange-sha256,
 .br
 diffie-hellman-group-exchange-sha1,

diff --git a/share/man/man5/sshd_config.5 b/share/man/man5/sshd_config.5
@@ -321,6 +321,8 @@ The supported ciphers are:
 ``aes128-ctr'',
 ``aes192-ctr'',
 ``aes256-ctr'',
+``aes128-gcm@openssh.com'',
+``aes256-gcm@openssh.com'',
 ``arcfour128'',
 ``arcfour256'',
 ``arcfour'',
@@ -333,6 +335,8 @@ The default is:
 
 aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,
 .br
+aes128-gcm@openssh.com,aes256-gcm@openssh.com,
+.br
 chacha20-poly1305@openssh.com,
 .br
 aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,
@@ -676,6 +680,8 @@ The default is
 
 curve25519-sha256@libssh.org,
 .br
+ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+.br
 diffie-hellman-group-exchange-sha256,
 .br
 diffie-hellman-group-exchange-sha1,

diff --git a/share/man/man8/sshd.8 b/share/man/man8/sshd.8
@@ -478,6 +478,9 @@ protocol version 1; the
 comment field is not used for anything (but may be convenient for the
 user to identify the key).
 For protocol version 2 the keytype is
+``ecdsa-sha2-nistp256'',
+``ecdsa-sha2-nistp384'',
+``ecdsa-sha2-nistp521'',
 ``ssh-ed25519'',
 ``ssh-dss''
 or

diff --git a/src/openssh/fileList.txt b/src/openssh/fileList.txt
@@ -2,16 +2,15 @@
 /etc/ssh/ssh_config
 /etc/ssh/ssh_host_dsa_key
 /etc/ssh/ssh_host_dsa_key.pub
+/etc/ssh/ssh_host_ecdsa_key
+/etc/ssh/ssh_host_ecdsa_key.pub
 /etc/ssh/ssh_host_ed25519_key
 /etc/ssh/ssh_host_ed25519_key.pub
 /etc/ssh/ssh_host_key
 /etc/ssh/ssh_host_key.pub
 /etc/ssh/ssh_host_rsa_key
 /etc/ssh/ssh_host_rsa_key.pub
 /etc/ssh/sshd_config
-/lib/libcrypto.dll.a
-/lib/libminires.dll.a
-/lib/textreadmode.o
 /libexec/sftp-server.exe
 /libexec/ssh-pkcs11-helper.exe
 /sbin/sshd.exe