Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / openssh / f11ba899d5c04b2e0445e0b47cbf26d89ced4f7d
commitf11ba899d5c04b2e0445e0b47cbf26d89ced4f7d[log] [tgz]
authorElliott Hughes <enh@google.com>Thu Feb 15 14:12:27 2018 -0800
committerElliott Hughes <enh@google.com>Thu Feb 15 14:12:27 2018 -0800
tree1804c52227ff07a47d4a4c9d030b869de8bae435
parent237e44dacc412e28e8c89e4e84b80f2d8e750da7 [diff]
Remove assumption that _PATH_BSHELL is a compile-time constant.

The alternative would be to build sshd using the (V)NDK, and I initially
went down that route but the because (a) we build sshd for API level 19
and (b) there are a couple of dependencies on non-NDK libraries/headers,
that's a significantly larger and more complicated change.

One day, when we don't have to support anything older than API 23 we
can remove most/all of the Android-specific changes in this project,
at which time we should drop this change and just build with the (V)NDK.

Bug: http://b/67975799
Test: builds
Change-Id: If6be7947e69b24cfa514a17bee6fef3cfbddc236
1 file changed
tree: 1804c52227ff07a47d4a4c9d030b869de8bae435
  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. misc.c
  151. misc.h
  152. mkinstalldirs
  153. moduli
  154. moduli.0
  155. moduli.5
  156. moduli.c
  157. monitor.c
  158. monitor.h
  159. monitor_fdpass.c
  160. monitor_fdpass.h
  161. monitor_wrap.c
  162. monitor_wrap.h
  163. msg.c
  164. msg.h
  165. mux.c
  166. myproposal.h
  167. nchan.c
  168. nchan.ms
  169. nchan2.ms
  170. opacket.c
  171. opacket.h
  172. openssh.xml.in
  173. opensshd.init.in
  174. OVERVIEW
  175. packet.c
  176. packet.h
  177. pathnames.h
  178. pkcs11.h
  179. platform-pledge.c
  180. platform-tracing.c
  181. platform.c
  182. platform.h
  183. poly1305.c
  184. poly1305.h
  185. progressmeter.c
  186. progressmeter.h
  187. PROTOCOL
  188. PROTOCOL.agent
  189. PROTOCOL.certkeys
  190. PROTOCOL.chacha20poly1305
  191. PROTOCOL.key
  192. PROTOCOL.krl
  193. PROTOCOL.mux
  194. readconf.c
  195. readconf.h
  196. README
  197. README.dns
  198. README.platform
  199. README.privsep
  200. README.tun
  201. README.version
  202. readpass.c
  203. rijndael.c
  204. rijndael.h
  205. rsa.c
  206. rsa.h
  207. sandbox-capsicum.c
  208. sandbox-darwin.c
  209. sandbox-null.c
  210. sandbox-pledge.c
  211. sandbox-rlimit.c
  212. sandbox-seccomp-filter.c
  213. sandbox-solaris.c
  214. sandbox-systrace.c
  215. sc25519.c
  216. sc25519.h
  217. scp.0
  218. scp.1
  219. scp.c
  220. servconf.c
  221. servconf.h
  222. serverloop.c
  223. serverloop.h
  224. session.c
  225. session.h
  226. sftp-client.c
  227. sftp-client.h
  228. sftp-common.c
  229. sftp-common.h
  230. sftp-glob.c
  231. sftp-server-main.c
  232. sftp-server.0
  233. sftp-server.8
  234. sftp-server.c
  235. sftp.0
  236. sftp.1
  237. sftp.c
  238. sftp.h
  239. smult_curve25519_ref.c
  240. ssh-add.0
  241. ssh-add.1
  242. ssh-add.c
  243. ssh-agent.0
  244. ssh-agent.1
  245. ssh-agent.c
  246. ssh-dss.c
  247. ssh-ecdsa.c
  248. ssh-ed25519.c
  249. ssh-gss.h
  250. ssh-keygen.0
  251. ssh-keygen.1
  252. ssh-keygen.c
  253. ssh-keyscan.0
  254. ssh-keyscan.1
  255. ssh-keyscan.c
  256. ssh-keysign.0
  257. ssh-keysign.8
  258. ssh-keysign.c
  259. ssh-pkcs11-client.c
  260. ssh-pkcs11-helper.0
  261. ssh-pkcs11-helper.8
  262. ssh-pkcs11-helper.c
  263. ssh-pkcs11.c
  264. ssh-pkcs11.h
  265. ssh-rsa.c
  266. ssh-sandbox.h
  267. ssh.0
  268. ssh.1
  269. ssh.c
  270. ssh.h
  271. ssh1.h
  272. ssh2.h
  273. ssh_api.c
  274. ssh_api.h
  275. ssh_config
  276. ssh_config.0
  277. ssh_config.5
  278. sshbuf-getput-basic.c
  279. sshbuf-getput-crypto.c
  280. sshbuf-misc.c
  281. sshbuf.c
  282. sshbuf.h
  283. sshconnect.c
  284. sshconnect.h
  285. sshconnect1.c
  286. sshconnect2.c
  287. sshd.0
  288. sshd.8
  289. sshd.c
  290. sshd_config
  291. sshd_config.0
  292. sshd_config.5
  293. sshd_config.android
  294. ssherr.c
  295. ssherr.h
  296. sshkey.c
  297. sshkey.h
  298. sshlogin.c
  299. sshlogin.h
  300. sshpty.c
  301. sshpty.h
  302. sshtty.c
  303. start-ssh
  304. survey.sh.in
  305. TODO
  306. ttymodes.c
  307. ttymodes.h
  308. uidswap.c
  309. uidswap.h
  310. umac.c
  311. umac.h
  312. umac128.c
  313. utf8.c
  314. utf8.h
  315. uuencode.c
  316. uuencode.h
  317. verify.c
  318. version.h
  319. xmalloc.c
  320. xmalloc.h