Solving name conflicts

pmeunier

Aug 19, 2021, 2:46 PM

7S7FHFDVSSRB4DCBZINHNWM3QJS6KYAR2L2HADDBDN4IHKN6KGLAC

Dependencies

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

Change contents

• resolve name conflict: thrussh-libsodium (d--r------)
  [1.0]→[3.0:19](∅→∅)
• resolve name conflict: src (d--r------)
  [4.20]→[3.20:25](∅→∅)
• resolve name conflict: lib.rs (----------)
  [4.27]→[3.26:34](∅→∅)
• resolve name conflict: Cargo.toml (----------)
  [4.20]→[3.35:47](∅→∅)
• resolve name conflict: thrussh-keys (d--r------)
  [1.0]→[3.48:62](∅→∅)
• resolve name conflict: src (d--r------)
  [4.5798]→[3.63:68](∅→∅)
• resolve name conflict: signature.rs (----------)
  [4.5805]→[3.69:83](∅→∅)
• resolve name conflict: pem.rs (----------)
  [4.5805]→[3.84:92](∅→∅)
• resolve name conflict: lib.rs (----------)
  [4.5805]→[3.93:101](∅→∅)
• resolve name conflict: key.rs (----------)
  [4.5805]→[3.102:110](∅→∅)
• resolve name conflict: format (d--r------)
  [4.5805]→[3.111:119](∅→∅)
• resolve name conflict: pkcs8.rs (----------)
  [4.71328]→[3.120:130](∅→∅)
• resolve name conflict: pkcs5.rs (----------)
  [4.71328]→[3.131:141](∅→∅)
• resolve name conflict: openssh.rs (----------)
  [4.71328]→[3.142:154](∅→∅)
• resolve name conflict: mod.rs (----------)
  [4.71328]→[3.155:163](∅→∅)
• resolve name conflict: encoding.rs (----------)
  [4.5805]→[3.164:177](∅→∅)
• resolve name conflict: blowfish.rs (----------)
  [4.5805]→[3.178:191](∅→∅)
• resolve name conflict: bcrypt_pbkdf.rs (----------)
  [4.5805]→[3.192:209](∅→∅)
• resolve name conflict: agent (d--r------)
  [4.5805]→[3.210:217](∅→∅)
• resolve name conflict: server.rs (----------)
  [4.125224]→[3.218:229](∅→∅)
• resolve name conflict: msg.rs (----------)
  [4.125224]→[3.230:238](∅→∅)
• resolve name conflict: mod.rs (----------)
  [4.125224]→[3.239:247](∅→∅)
• resolve name conflict: client.rs (----------)
  [4.125224]→[3.248:259](∅→∅)
• resolve name conflict: Cargo.toml (----------)
  [4.5798]→[2.745:757](∅→∅)
• resolve name conflict: thrussh-config (d--r------)
  [1.0]→[2.758:774](∅→∅)
• resolve name conflict: src (d--r------)
  [4.158258]→[2.775:780](∅→∅)
• resolve name conflict: proxy.rs (----------)
  [4.158265]→[2.781:791](∅→∅)
• resolve name conflict: lib.rs (----------)
  [4.158265]→[2.792:800](∅→∅)
• resolve name conflict: Cargo.toml (----------)
  [4.158258]→[2.801:813](∅→∅)
• resolve name conflict: thrussh (d--r------)
  [1.0]→[2.814:823](∅→∅)
• resolve name conflict: src (d--r------)
  [4.165397]→[2.824:829](∅→∅)
• resolve name conflict: sshbuffer.rs (----------)
  [4.165404]→[2.830:844](∅→∅)
• resolve name conflict: ssh_read.rs (----------)
  [4.165404]→[2.845:858](∅→∅)
• resolve name conflict: session.rs (----------)
  [4.165404]→[2.859:871](∅→∅)
• resolve name conflict: server (d--r------)
  [4.165404]→[2.872:880](∅→∅)
• resolve name conflict: session.rs (----------)
  [4.188178]→[2.881:893](∅→∅)
• resolve name conflict: mod.rs (----------)
  [4.188178]→[2.894:902](∅→∅)
• resolve name conflict: kex.rs (----------)
  [4.188178]→[2.903:911](∅→∅)
• resolve name conflict: encrypted.rs (----------)
  [4.188178]→[2.912:926](∅→∅)
• resolve name conflict: pty.rs (---r------)
  [4.165404]→[2.927:935](∅→∅)
• resolve name conflict: negotiation.rs (----------)
  [4.165404]→[2.936:952](∅→∅)
• resolve name conflict: msg.rs (----------)
  [4.165404]→[2.953:961](∅→∅)
• resolve name conflict: lib.rs (----------)
  [4.165404]→[2.962:970](∅→∅)
• resolve name conflict: key.rs (----------)
  [4.165404]→[2.971:979](∅→∅)
• resolve name conflict: kex.rs (----------)
  [4.165404]→[2.980:988](∅→∅)
• resolve name conflict: compression.rs (----------)
  [4.165404]→[2.989:1005](∅→∅)
• resolve name conflict: client (d--r------)
  [4.165404]→[2.1006:1014](∅→∅)
• resolve name conflict: session.rs (----------)
  [4.319192]→[2.1015:1027](∅→∅)
• resolve name conflict: proxy.rs (----------)
  [4.319192]→[2.1028:1038](∅→∅)
• resolve name conflict: mod.rs (----------)
  [4.319192]→[2.1039:1047](∅→∅)
• resolve name conflict: kex.rs (----------)
  [4.319192]→[2.1048:1056](∅→∅)
• resolve name conflict: encrypted.rs (----------)
  [4.319192]→[2.1057:1071](∅→∅)
• resolve name conflict: cipher (d--r------)
  [4.165404]→[2.1072:1080](∅→∅)
• resolve name conflict: mod.rs (----------)
  [4.409076]→[2.1081:1089](∅→∅)
• resolve name conflict: clear.rs (----------)
  [4.409076]→[2.1090:1100](∅→∅)
• resolve name conflict: chacha20poly1305.rs (----------)
  [4.409076]→[2.1101:1122](∅→∅)
• resolve name conflict: auth.rs (----------)
  [4.165404]→[2.1123:1132](∅→∅)
• file move: examples (d--r------)examples (d--r------) → examples (d--r------)
  [4.165397]

  [4.11]
• file move: remote_shell_call.rs (----------)remote_shell_call.rs (----------) → remote_shell_call.rs (----------)
  [4.11]

  [4.23]
• file move: client.rs (----------)client.rs (----------) → client.rs (----------)
  [4.11]

  [4.24]
• resolve name conflict: Cargo.toml (---r------)
  [4.165397]→[2.1179:1191](∅→∅)
• resolve name conflict: shell.nix (----------)
  [1.0]→[2.1192:1203](∅→∅)
• resolve name conflict: cryptovec (d--r------)
  [1.0]→[2.1204:1215](∅→∅)
• resolve name conflict: src (d--r------)
  [4.427973]→[2.1216:1221](∅→∅)
• resolve name conflict: lib.rs (----------)
  [4.427980]→[2.1222:1230](∅→∅)
• resolve name conflict: Cargo.toml (----------)
  [4.427973]→[2.1231:1243](∅→∅)
• resolve name conflict: README.md (----------)
  [1.0]→[2.1244:1255](∅→∅)
• resolve name conflict: LICENSE-2.0.txt (---r------)
  [1.0]→[2.1256:1273](∅→∅)
• resolve name conflict: Cargo.toml (----------)
  [1.0]→[2.1274:1286](∅→∅)