[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6cca743bfa am: a7a81d0411 am: 040c3082b4 am: e2bd1d90fd -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/openssh/+/8361027

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