Solving conflicts introduced by an old format change

pmeunier

Jul 13, 2021, 9:23 AM

F4WG4OHQTGJXBASXG57FXX3DB33GY2TMXWCPL4BMPTX6D4HN2ZGQC

Dependencies

• [2] FT67GGO4 Version bump (Pijul and Thrussh)
• [3] NLPZS76W Make AgentSigner::sign_request_signature return self on error
• [4] 7FRJYUI6 Reboot because of a bad change
• [5] BITIYBKM Removing Cargo.lock (tokio 0.3)
• [6] KGIUIQYI Executing a shell command example
• [7] HDEDMPBT Client example

Change contents

• resolve name conflict: thrussh-libsodium (dxwrx-rx-r)thrussh-libsodium (dxwrx-rx-r)
  [1.0]→[4.0:19](∅→∅),[1.0]→[4.0:19](∅→∅)
• resolve name conflict: src (dxwrx-rx-r)src (dxwrx-rx-r)
  [4.20]→[4.21:26](∅→∅),[4.20]→[4.21:26](∅→∅)
• resolve name conflict: lib.rs (-xw-x--x--)lib.rs (-xw-x--x--)
  [4.27]→[4.28:36](∅→∅),[4.27]→[4.28:36](∅→∅)
• resolve name conflict: Cargo.toml (-xw-x--x--)Cargo.toml (-xw-x--x--)
  [4.20]→[4.5297:5309](∅→∅),[4.20]→[4.5297:5309](∅→∅)
• resolve name conflict: thrussh-keys (dxwrx-rx-r)thrussh-keys (dxwrx-rx-r)
  [1.0]→[4.5783:5797](∅→∅),[1.0]→[4.5783:5797](∅→∅)
• resolve name conflict: src (dxwrx-rx-r)src (dxwrx-rx-r)
  [4.5798]→[4.5799:5804](∅→∅),[4.5798]→[4.5799:5804](∅→∅)
• resolve name conflict: signature.rs (-xw-x--x--)signature.rs (-xw-x--x--)
  [4.5805]→[4.5806:5820](∅→∅),[4.5805]→[4.5806:5820](∅→∅)
• resolve name conflict: pem.rs (-xw-x--x--)pem.rs (-xw-x--x--)
  [4.5805]→[4.10516:10524](∅→∅),[4.5805]→[4.10516:10524](∅→∅)
• resolve name conflict: lib.rs (-xw-x--x--)lib.rs (-xw-x--x--)
  [4.5805]→[4.21581:21589](∅→∅),[4.5805]→[4.21581:21589](∅→∅)
• resolve name conflict: key.rs (-xw-x--x--)key.rs (-xw-x--x--)
  [4.5805]→[4.57442:57450](∅→∅),[4.5805]→[4.57442:57450](∅→∅)
• resolve name conflict: format (dxwrx-rx-r)format (dxwrx-rx-r)
  [4.5805]→[4.71319:71327](∅→∅),[4.5805]→[4.71319:71327](∅→∅)
• resolve name conflict: pkcs8.rs (-xw-x--x--)pkcs8.rs (-xw-x--x--)
  [4.71328]→[4.71329:71339](∅→∅),[4.71328]→[4.71329:71339](∅→∅)
• resolve name conflict: pkcs5.rs (-xw-x--x--)pkcs5.rs (-xw-x--x--)
  [4.71328]→[4.85742:85752](∅→∅),[4.71328]→[4.85742:85752](∅→∅)
• resolve name conflict: openssh.rs (-xw-x--x--)openssh.rs (-xw-x--x--)
  [4.71328]→[4.86796:86808](∅→∅),[4.71328]→[4.86796:86808](∅→∅)
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.71328]→[4.92023:92031](∅→∅),[4.71328]→[4.92023:92031](∅→∅)
• resolve name conflict: encoding.rs (-xw-x--x--)encoding.rs (-xw-x--x--)
  [4.5805]→[4.96053:96066](∅→∅),[4.5805]→[4.96053:96066](∅→∅)
• resolve name conflict: blowfish.rs (-xw-x--x--)blowfish.rs (-xw-x--x--)
  [4.5805]→[4.102798:102811](∅→∅),[4.5805]→[4.102798:102811](∅→∅)
• resolve name conflict: bcrypt_pbkdf.rs (-xw-x--x--)bcrypt_pbkdf.rs (-xw-x--x--)
  [4.5805]→[4.122705:122722](∅→∅),[4.5805]→[4.122705:122722](∅→∅)
• resolve name conflict: agent (dxwrx-rx-r)agent (dxwrx-rx-r)
  [4.5805]→[4.125216:125223](∅→∅),[4.5805]→[4.125216:125223](∅→∅)
• resolve name conflict: server.rs (-xw-x--x--)server.rs (-xw-x--x--)
  [4.125224]→[4.125225:125236](∅→∅),[4.125224]→[4.125225:125236](∅→∅)
• resolve name conflict: msg.rs (-xw-x--x--)msg.rs (-xw-x--x--)
  [4.125224]→[4.137846:137854](∅→∅),[4.125224]→[4.137846:137854](∅→∅)
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.125224]→[4.138573:138581](∅→∅),[4.125224]→[4.138573:138581](∅→∅)
• resolve name conflict: client.rs (-xw-x--x--)client.rs (-xw-x--x--)
  [4.125224]→[4.139081:139092](∅→∅),[4.125224]→[4.139081:139092](∅→∅)
• resolve name conflict: Cargo.toml (-xw-x--x--)Cargo.toml (-xw-x--x--)
  [4.5798]→[4.157011:157023](∅→∅),[4.5798]→[4.157011:157023](∅→∅)
• resolve name conflict: thrussh-config (dxwrx-rx-r)thrussh-config (dxwrx-rx-r)
  [1.0]→[4.158241:158257](∅→∅),[1.0]→[4.158241:158257](∅→∅)
• resolve name conflict: src (dxwrx-rx-r)src (dxwrx-rx-r)
  [4.158258]→[4.158259:158264](∅→∅),[4.158258]→[4.158259:158264](∅→∅)
• resolve name conflict: proxy.rs (-xw-x--x--)proxy.rs (-xw-x--x--)
  [4.158265]→[4.158266:158276](∅→∅),[4.158265]→[4.158266:158276](∅→∅)
• resolve name conflict: lib.rs (-xw-x--x--)lib.rs (-xw-x--x--)
  [4.158265]→[4.161105:161113](∅→∅),[4.158265]→[4.161105:161113](∅→∅)
• resolve name conflict: Cargo.toml (-xw-x--x--)Cargo.toml (-xw-x--x--)
  [4.158258]→[4.164774:164786](∅→∅),[4.158258]→[4.164774:164786](∅→∅)
• resolve name conflict: thrussh (dxwrx-rx-r)thrussh (dxwrx-rx-r)
  [1.0]→[4.165387:165396](∅→∅),[1.0]→[4.165387:165396](∅→∅)
• resolve name conflict: src (dxwrx-rx-r)src (dxwrx-rx-r)
  [4.165397]→[4.165398:165403](∅→∅),[4.165397]→[4.165398:165403](∅→∅)
• resolve name conflict: sshbuffer.rs (-xw-x--x--)sshbuffer.rs (-xw-x--x--)
  [4.165404]→[4.165405:165419](∅→∅),[4.165404]→[4.165405:165419](∅→∅)
• resolve name conflict: ssh_read.rs (-xw-x--x--)ssh_read.rs (-xw-x--x--)
  [4.165404]→[4.166674:166687](∅→∅),[4.165404]→[4.166674:166687](∅→∅)
• resolve name conflict: session.rs (-xw-x--x--)session.rs (-xw-x--x--)
  [4.165404]→[4.171589:171601](∅→∅),[4.165404]→[4.171589:171601](∅→∅)
• resolve name conflict: server (dxwrx-rx-r)server (dxwrx-rx-r)
  [4.165404]→[4.188169:188177](∅→∅),[4.165404]→[4.188169:188177](∅→∅)
• resolve name conflict: session.rs (-xw-x--x--)session.rs (-xw-x--x--)
  [4.188178]→[4.188179:188191](∅→∅),[4.188178]→[4.188179:188191](∅→∅)
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.188178]→[4.203379:203387](∅→∅),[4.188178]→[4.203379:203387](∅→∅)
• resolve name conflict: kex.rs (-xw-x--x--)kex.rs (-xw-x--x--)
  [4.188178]→[4.225717:225725](∅→∅),[4.188178]→[4.225717:225725](∅→∅)
• resolve name conflict: encrypted.rs (-xw-x--x--)encrypted.rs (-xw-x--x--)
  [4.188178]→[4.230068:230082](∅→∅),[4.188178]→[4.230068:230082](∅→∅)
• resolve name conflict: pty.rs (-xwrx-rx-r)pty.rs (-xwrx-rx-r)
  [4.165404]→[4.265111:265119](∅→∅),[4.165404]→[4.265111:265119](∅→∅)
• resolve name conflict: negotiation.rs (-xw-x--x--)negotiation.rs (-xw-x--x--)
  [4.165404]→[4.268369:268385](∅→∅),[4.165404]→[4.268369:268385](∅→∅)
• resolve name conflict: msg.rs (-xw-x--x--)msg.rs (-xw-x--x--)
  [4.165404]→[4.276610:276618](∅→∅),[4.165404]→[4.276610:276618](∅→∅)
• resolve name conflict: lib.rs (-xw-x--x--)lib.rs (-xw-x--x--)
  [4.165404]→[4.278631:278639](∅→∅),[4.165404]→[4.278631:278639](∅→∅)
• resolve name conflict: key.rs (-xw-x--x--)key.rs (-xw-x--x--)
  [4.165404]→[4.304491:304499](∅→∅),[4.165404]→[4.304491:304499](∅→∅)
• resolve name conflict: kex.rs (-xw-x--x--)kex.rs (-xw-x--x--)
  [4.165404]→[4.306907:306915](∅→∅),[4.165404]→[4.306907:306915](∅→∅)
• resolve name conflict: compression.rs (-xw-x--x--)compression.rs (-xw-x--x--)
  [4.165404]→[4.314834:314850](∅→∅),[4.165404]→[4.314834:314850](∅→∅)
• resolve name conflict: client (dxwrx-rx-r)client (dxwrx-rx-r)
  [4.165404]→[4.319183:319191](∅→∅),[4.165404]→[4.319183:319191](∅→∅)
• resolve name conflict: session.rs (-xw-x--x--)session.rs (-xw-x--x--)
  [4.319192]→[4.319193:319205](∅→∅),[4.319192]→[4.319193:319205](∅→∅)
• resolve name conflict: proxy.rs (-xw-x--x--)proxy.rs (-xw-x--x--)
  [4.319192]→[4.332735:332745](∅→∅),[4.319192]→[4.332735:332745](∅→∅)
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.319192]→[4.334989:334997](∅→∅),[4.319192]→[4.334989:334997](∅→∅)
• resolve name conflict: kex.rs (-xw-x--x--)kex.rs (-xw-x--x--)
  [4.319192]→[4.381537:381545](∅→∅),[4.319192]→[4.381537:381545](∅→∅)
• resolve name conflict: encrypted.rs (-xw-x--x--)encrypted.rs (-xw-x--x--)
  [4.319192]→[4.383862:383876](∅→∅),[4.319192]→[4.383862:383876](∅→∅)
• resolve name conflict: cipher (dxwrx-rx-r)cipher (dxwrx-rx-r)
  [4.165404]→[4.409067:409075](∅→∅),[4.165404]→[4.409067:409075](∅→∅)
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.409076]→[4.409077:409085](∅→∅),[4.409076]→[4.409077:409085](∅→∅)
• resolve name conflict: clear.rs (-xw-x--x--)clear.rs (-xw-x--x--)
  [4.409076]→[4.414922:414932](∅→∅),[4.409076]→[4.414922:414932](∅→∅)
• resolve name conflict: chacha20poly1305.rs (-xw-x--x--)chacha20poly1305.rs (-xw-x--x--)
  [4.409076]→[4.416998:417019](∅→∅),[4.409076]→[4.416998:417019](∅→∅)
• resolve name conflict: auth.rs (-xw-x--x--)auth.rs (-xw-x--x--)
  [4.165404]→[4.421946:421955](∅→∅),[4.165404]→[4.421946:421955](∅→∅)
• resolve name conflict: examples (dxwrx-rx-r)examples (dxwrx-rx-r)
  [4.165397]→[4.0:10](∅→∅),[4.165397]→[4.0:10](∅→∅)
• resolve name conflict: remote_shell_call.rs (-xw-x--x--)remote_shell_call.rs (-xw-x--x--)
  [4.11]→[4.0:22](∅→∅),[4.11]→[4.0:22](∅→∅)
• resolve name conflict: client.rs (-xw-x--x--)client.rs (-xw-x--x--)
  [4.11]→[4.12:23](∅→∅),[4.11]→[4.12:23](∅→∅)
• resolve name conflict: Cargo.toml (-xwrx-rx-r)Cargo.toml (-xwrx-rx-r)
  [4.165397]→[4.426105:426117](∅→∅),[4.165397]→[4.426105:426117](∅→∅)
• resolve name conflict: shell.nix (-xw-x--x--)shell.nix (-xw-x--x--)
  [1.0]→[4.427527:427538](∅→∅),[1.0]→[4.427527:427538](∅→∅)
• resolve name conflict: cryptovec (dxwrx-rx-r)cryptovec (dxwrx-rx-r)
  [1.0]→[4.427961:427972](∅→∅),[1.0]→[4.427961:427972](∅→∅)
• resolve name conflict: src (dxwrx-rx-r)src (dxwrx-rx-r)
  [4.427973]→[4.427974:427979](∅→∅),[4.427973]→[4.427974:427979](∅→∅)
• resolve name conflict: lib.rs (-xw-x--x--)lib.rs (-xw-x--x--)
  [4.427980]→[4.427981:427989](∅→∅),[4.427980]→[4.427981:427989](∅→∅)
• resolve name conflict: Cargo.toml (-xw-x--x--)Cargo.toml (-xw-x--x--)
  [4.427973]→[4.440647:440659](∅→∅),[4.427973]→[4.440647:440659](∅→∅)
• resolve name conflict: README.md (-xw-x--x--)README.md (-xw-x--x--)
  [1.0]→[4.441113:441124](∅→∅),[1.0]→[4.441113:441124](∅→∅)
• resolve name conflict: LICENSE-2.0.txt (-xwrx-rx-r)LICENSE-2.0.txt (-xwrx-rx-r)
  [1.0]→[4.442350:442367](∅→∅),[1.0]→[4.442350:442367](∅→∅)
• resolve name conflict: Cargo.toml (-xw-x--x--)Cargo.toml (-xw-x--x--)
  [1.0]→[4.453728:453740](∅→∅),[1.0]→[4.453728:453740](∅→∅)