comparison src/ch/ethz/ssh2/packets/PacketKexInit.java @ 307:071eccdff8ea ganymed

fix java formatting
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 14:16:58 -0700
parents 91a31873c42a
children
comparison
equal deleted inserted replaced
305:d2b303406d63 307:071eccdff8ea
22 KexParameters kp = new KexParameters(); 22 KexParameters kp = new KexParameters();
23 23
24 public PacketKexInit(CryptoWishList cwl, SecureRandom rnd) { 24 public PacketKexInit(CryptoWishList cwl, SecureRandom rnd) {
25 kp.cookie = new byte[16]; 25 kp.cookie = new byte[16];
26 rnd.nextBytes(kp.cookie); 26 rnd.nextBytes(kp.cookie);
27
28 kp.kex_algorithms = cwl.kexAlgorithms; 27 kp.kex_algorithms = cwl.kexAlgorithms;
29 kp.server_host_key_algorithms = cwl.serverHostKeyAlgorithms; 28 kp.server_host_key_algorithms = cwl.serverHostKeyAlgorithms;
30 kp.encryption_algorithms_client_to_server = cwl.c2s_enc_algos; 29 kp.encryption_algorithms_client_to_server = cwl.c2s_enc_algos;
31 kp.encryption_algorithms_server_to_client = cwl.s2c_enc_algos; 30 kp.encryption_algorithms_server_to_client = cwl.s2c_enc_algos;
32 kp.mac_algorithms_client_to_server = cwl.c2s_mac_algos; 31 kp.mac_algorithms_client_to_server = cwl.c2s_mac_algos;
33 kp.mac_algorithms_server_to_client = cwl.s2c_mac_algos; 32 kp.mac_algorithms_server_to_client = cwl.s2c_mac_algos;
34 kp.compression_algorithms_client_to_server = cwl.c2s_comp_algos; 33 kp.compression_algorithms_client_to_server = cwl.c2s_comp_algos;
35 kp.compression_algorithms_server_to_client = cwl.s2c_comp_algos; 34 kp.compression_algorithms_server_to_client = cwl.s2c_comp_algos;
36 kp.languages_client_to_server = new String[]{""}; 35 kp.languages_client_to_server = new String[] {""};
37 kp.languages_server_to_client = new String[]{""}; 36 kp.languages_server_to_client = new String[] {""};
38 kp.first_kex_packet_follows = false; 37 kp.first_kex_packet_follows = false;
39 kp.reserved_field1 = 0; 38 kp.reserved_field1 = 0;
40
41 TypesWriter tw = new TypesWriter(); 39 TypesWriter tw = new TypesWriter();
42 tw.writeByte(Packets.SSH_MSG_KEXINIT); 40 tw.writeByte(Packets.SSH_MSG_KEXINIT);
43 tw.writeBytes(kp.cookie, 0, 16); 41 tw.writeBytes(kp.cookie, 0, 16);
44 tw.writeNameList(kp.kex_algorithms); 42 tw.writeNameList(kp.kex_algorithms);
45 tw.writeNameList(kp.server_host_key_algorithms); 43 tw.writeNameList(kp.server_host_key_algorithms);
56 payload = tw.getBytes(); 54 payload = tw.getBytes();
57 } 55 }
58 56
59 public PacketKexInit(byte payload[]) throws IOException { 57 public PacketKexInit(byte payload[]) throws IOException {
60 this.payload = payload; 58 this.payload = payload;
61
62 TypesReader tr = new TypesReader(payload); 59 TypesReader tr = new TypesReader(payload);
63
64 int packet_type = tr.readByte(); 60 int packet_type = tr.readByte();
65 61
66 if(packet_type != Packets.SSH_MSG_KEXINIT) { 62 if (packet_type != Packets.SSH_MSG_KEXINIT) {
67 throw new PacketTypeException(packet_type); 63 throw new PacketTypeException(packet_type);
68 } 64 }
65
69 kp.cookie = tr.readBytes(16); 66 kp.cookie = tr.readBytes(16);
70 kp.kex_algorithms = tr.readNameList(); 67 kp.kex_algorithms = tr.readNameList();
71 kp.server_host_key_algorithms = tr.readNameList(); 68 kp.server_host_key_algorithms = tr.readNameList();
72 kp.encryption_algorithms_client_to_server = tr.readNameList(); 69 kp.encryption_algorithms_client_to_server = tr.readNameList();
73 kp.encryption_algorithms_server_to_client = tr.readNameList(); 70 kp.encryption_algorithms_server_to_client = tr.readNameList();
78 kp.languages_client_to_server = tr.readNameList(); 75 kp.languages_client_to_server = tr.readNameList();
79 kp.languages_server_to_client = tr.readNameList(); 76 kp.languages_server_to_client = tr.readNameList();
80 kp.first_kex_packet_follows = tr.readBoolean(); 77 kp.first_kex_packet_follows = tr.readBoolean();
81 kp.reserved_field1 = tr.readUINT32(); 78 kp.reserved_field1 = tr.readUINT32();
82 79
83 if(tr.remain() != 0) { 80 if (tr.remain() != 0) {
84 throw new PacketFormatException(String.format("Padding in %s", Packets.getMessageName(packet_type))); 81 throw new PacketFormatException(String.format("Padding in %s", Packets.getMessageName(packet_type)));
85 } 82 }
86 } 83 }
87 84
88 public byte[] getPayload() { 85 public byte[] getPayload() {