upstream: save the derived session id in kex_derive_keys() rather

than making each kex method implementation do it.

from markus@ ok djm@

OpenBSD-Commit-ID: d61ade9c8d1e13f665f8663c552abff8c8a30673
9 files changed
tree: 6fa154f6478dd9b35d90716573420f3c517c49ab
  1. contrib/
  2. openbsd-compat/
  3. regress/
  4. .depend
  5. .gitignore
  6. .skipped-commit-ids
  7. aclocal.m4
  8. addrmatch.c
  9. atomicio.c
  10. atomicio.h
  11. audit-bsm.c
  12. audit-linux.c
  13. audit.c
  14. audit.h
  15. auth-bsdauth.c
  16. auth-krb5.c
  17. auth-options.c
  18. auth-options.h
  19. auth-pam.c
  20. auth-pam.h
  21. auth-passwd.c
  22. auth-rhosts.c
  23. auth-shadow.c
  24. auth-sia.c
  25. auth-sia.h
  26. auth-skey.c
  27. auth.c
  28. auth.h
  29. auth2-chall.c
  30. auth2-gss.c
  31. auth2-hostbased.c
  32. auth2-kbdint.c
  33. auth2-none.c
  34. auth2-passwd.c
  35. auth2-pubkey.c
  36. auth2.c
  37. authfd.c
  38. authfd.h
  39. authfile.c
  40. authfile.h
  41. bitmap.c
  42. bitmap.h
  43. buildpkg.sh.in
  44. canohost.c
  45. canohost.h
  46. chacha.c
  47. chacha.h
  48. channels.c
  49. channels.h
  50. cipher-aes.c
  51. cipher-aesctr.c
  52. cipher-aesctr.h
  53. cipher-chachapoly.c
  54. cipher-chachapoly.h
  55. cipher-ctr.c
  56. cipher.c
  57. cipher.h
  58. cleanup.c
  59. clientloop.c
  60. clientloop.h
  61. compat.c
  62. compat.h
  63. config.guess
  64. config.sub
  65. configure.ac
  66. crc32.c
  67. crc32.h
  68. CREDITS
  69. crypto_api.h
  70. defines.h
  71. dh.c
  72. dh.h
  73. digest-libc.c
  74. digest-openssl.c
  75. digest.h
  76. dispatch.c
  77. dispatch.h
  78. dns.c
  79. dns.h
  80. ed25519.c
  81. entropy.c
  82. entropy.h
  83. fatal.c
  84. fe25519.c
  85. fe25519.h
  86. fixalgorithms
  87. fixpaths
  88. ge25519.c
  89. ge25519.h
  90. ge25519_base.data
  91. groupaccess.c
  92. groupaccess.h
  93. gss-genr.c
  94. gss-serv-krb5.c
  95. gss-serv.c
  96. hash.c
  97. hmac.c
  98. hmac.h
  99. hostfile.c
  100. hostfile.h
  101. includes.h
  102. INSTALL
  103. install-sh
  104. kex.c
  105. kex.h
  106. kexc25519.c
  107. kexc25519c.c
  108. kexc25519s.c
  109. kexdh.c
  110. kexdhc.c
  111. kexdhs.c
  112. kexecdh.c
  113. kexecdhc.c
  114. kexecdhs.c
  115. kexgex.c
  116. kexgexc.c
  117. kexgexs.c
  118. krl.c
  119. krl.h
  120. LICENCE
  121. log.c
  122. log.h
  123. loginrec.c
  124. loginrec.h
  125. logintest.c
  126. mac.c
  127. mac.h
  128. Makefile.in
  129. match.c
  130. match.h
  131. md5crypt.c
  132. md5crypt.h
  133. mdoc2man.awk
  134. misc.c
  135. misc.h
  136. mkinstalldirs
  137. moduli
  138. moduli.5
  139. moduli.c
  140. monitor.c
  141. monitor.h
  142. monitor_fdpass.c
  143. monitor_fdpass.h
  144. monitor_wrap.c
  145. monitor_wrap.h
  146. msg.c
  147. msg.h
  148. mux.c
  149. myproposal.h
  150. nchan.c
  151. nchan.ms
  152. nchan2.ms
  153. openssh.xml.in
  154. opensshd.init.in
  155. OVERVIEW
  156. packet.c
  157. packet.h
  158. pathnames.h
  159. pkcs11.h
  160. platform-misc.c
  161. platform-pledge.c
  162. platform-tracing.c
  163. platform.c
  164. platform.h
  165. poly1305.c
  166. poly1305.h
  167. progressmeter.c
  168. progressmeter.h
  169. PROTOCOL
  170. PROTOCOL.agent
  171. PROTOCOL.certkeys
  172. PROTOCOL.chacha20poly1305
  173. PROTOCOL.key
  174. PROTOCOL.krl
  175. PROTOCOL.mux
  176. readconf.c
  177. readconf.h
  178. README
  179. README.dns
  180. README.platform
  181. README.privsep
  182. README.tun
  183. readpass.c
  184. rijndael.c
  185. rijndael.h
  186. sandbox-capsicum.c
  187. sandbox-darwin.c
  188. sandbox-null.c
  189. sandbox-pledge.c
  190. sandbox-rlimit.c
  191. sandbox-seccomp-filter.c
  192. sandbox-solaris.c
  193. sandbox-systrace.c
  194. sc25519.c
  195. sc25519.h
  196. scp.1
  197. scp.c
  198. servconf.c
  199. servconf.h
  200. serverloop.c
  201. serverloop.h
  202. session.c
  203. session.h
  204. sftp-client.c
  205. sftp-client.h
  206. sftp-common.c
  207. sftp-common.h
  208. sftp-glob.c
  209. sftp-server-main.c
  210. sftp-server.8
  211. sftp-server.c
  212. sftp.1
  213. sftp.c
  214. sftp.h
  215. smult_curve25519_ref.c
  216. ssh-add.1
  217. ssh-add.c
  218. ssh-agent.1
  219. ssh-agent.c
  220. ssh-dss.c
  221. ssh-ecdsa.c
  222. ssh-ed25519.c
  223. ssh-gss.h
  224. ssh-keygen.1
  225. ssh-keygen.c
  226. ssh-keyscan.1
  227. ssh-keyscan.c
  228. ssh-keysign.8
  229. ssh-keysign.c
  230. ssh-pkcs11-client.c
  231. ssh-pkcs11-helper.8
  232. ssh-pkcs11-helper.c
  233. ssh-pkcs11.c
  234. ssh-pkcs11.h
  235. ssh-rsa.c
  236. ssh-sandbox.h
  237. ssh-xmss.c
  238. ssh.1
  239. ssh.c
  240. ssh.h
  241. ssh2.h
  242. ssh_api.c
  243. ssh_api.h
  244. ssh_config
  245. ssh_config.5
  246. sshbuf-getput-basic.c
  247. sshbuf-getput-crypto.c
  248. sshbuf-misc.c
  249. sshbuf.c
  250. sshbuf.h
  251. sshconnect.c
  252. sshconnect.h
  253. sshconnect2.c
  254. sshd.8
  255. sshd.c
  256. sshd_config
  257. sshd_config.5
  258. ssherr.c
  259. ssherr.h
  260. sshkey-xmss.c
  261. sshkey-xmss.h
  262. sshkey.c
  263. sshkey.h
  264. sshlogin.c
  265. sshlogin.h
  266. sshpty.c
  267. sshpty.h
  268. sshtty.c
  269. survey.sh.in
  270. TODO
  271. ttymodes.c
  272. ttymodes.h
  273. uidswap.c
  274. uidswap.h
  275. umac.c
  276. umac.h
  277. umac128.c
  278. utf8.c
  279. utf8.h
  280. uuencode.c
  281. uuencode.h
  282. verify.c
  283. version.h
  284. xmalloc.c
  285. xmalloc.h
  286. xmss_commons.c
  287. xmss_commons.h
  288. xmss_fast.c
  289. xmss_fast.h
  290. xmss_hash.c
  291. xmss_hash.h
  292. xmss_hash_address.c
  293. xmss_hash_address.h
  294. xmss_wots.c
  295. xmss_wots.h