![[BACK]](/icons/back.gif){kind=icon}
Return to opacket.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / ssh|
Return to opacket.c CVS log | Up to [local] / src / usr.bin / ssh |
1.1 markus 1: /* Written by Markus Friedl. Placed in the public domain. */
2:
3: #include "ssherr.h"
4: #include "packet.h"
5: #include "log.h"
6:
7: struct ssh *active_state, *backup_state;
8:
9: /* Map old to new API */
10:
11: void
12: ssh_packet_start(struct ssh *ssh, u_char type)
13: {
14: int r;
15:
16: if ((r = sshpkt_start(ssh, type)) != 0)
17: fatal("%s: %s", __func__, ssh_err(r));
18: }
19:
20: void
21: ssh_packet_put_char(struct ssh *ssh, int value)
22: {
23: u_char ch = value;
24: int r;
25:
26: if ((r = sshpkt_put_u8(ssh, ch)) != 0)
27: fatal("%s: %s", __func__, ssh_err(r));
28: }
29:
30: void
31: ssh_packet_put_int(struct ssh *ssh, u_int value)
32: {
33: int r;
34:
35: if ((r = sshpkt_put_u32(ssh, value)) != 0)
36: fatal("%s: %s", __func__, ssh_err(r));
37: }
38:
39: void
40: ssh_packet_put_int64(struct ssh *ssh, u_int64_t value)
41: {
42: int r;
43:
44: if ((r = sshpkt_put_u64(ssh, value)) != 0)
45: fatal("%s: %s", __func__, ssh_err(r));
46: }
47:
48: void
49: ssh_packet_put_string(struct ssh *ssh, const void *buf, u_int len)
50: {
51: int r;
52:
53: if ((r = sshpkt_put_string(ssh, buf, len)) != 0)
54: fatal("%s: %s", __func__, ssh_err(r));
55: }
56:
57: void
58: ssh_packet_put_cstring(struct ssh *ssh, const char *str)
59: {
60: int r;
61:
62: if ((r = sshpkt_put_cstring(ssh, str)) != 0)
63: fatal("%s: %s", __func__, ssh_err(r));
64: }
65:
66: void
67: ssh_packet_put_raw(struct ssh *ssh, const void *buf, u_int len)
68: {
69: int r;
70:
71: if ((r = sshpkt_put(ssh, buf, len)) != 0)
72: fatal("%s: %s", __func__, ssh_err(r));
73: }
74:
1.4 ! djm 75: #ifdef WITH_SSH1
1.1 markus 76: void
77: ssh_packet_put_bignum(struct ssh *ssh, BIGNUM * value)
78: {
79: int r;
80:
81: if ((r = sshpkt_put_bignum1(ssh, value)) != 0)
82: fatal("%s: %s", __func__, ssh_err(r));
83: }
1.4 ! djm 84: #endif
1.1 markus 85:
1.4 ! djm 86: #ifdef WITH_OPENSSL
1.1 markus 87: void
88: ssh_packet_put_bignum2(struct ssh *ssh, BIGNUM * value)
89: {
90: int r;
91:
92: if ((r = sshpkt_put_bignum2(ssh, value)) != 0)
93: fatal("%s: %s", __func__, ssh_err(r));
94: }
95:
96: void
97: ssh_packet_put_ecpoint(struct ssh *ssh, const EC_GROUP *curve,
98: const EC_POINT *point)
99: {
100: int r;
101:
102: if ((r = sshpkt_put_ec(ssh, point, curve)) != 0)
103: fatal("%s: %s", __func__, ssh_err(r));
104: }
105: #endif /* WITH_OPENSSL */
106:
107: void
108: ssh_packet_send(struct ssh *ssh)
109: {
110: int r;
111:
112: if ((r = sshpkt_send(ssh)) != 0)
113: fatal("%s: %s", __func__, ssh_err(r));
114: }
115:
116: u_int
117: ssh_packet_get_char(struct ssh *ssh)
118: {
119: u_char ch;
120: int r;
121:
122: if ((r = sshpkt_get_u8(ssh, &ch)) != 0)
123: fatal("%s: %s", __func__, ssh_err(r));
124: return ch;
125: }
126:
127: u_int
128: ssh_packet_get_int(struct ssh *ssh)
129: {
130: u_int val;
131: int r;
132:
133: if ((r = sshpkt_get_u32(ssh, &val)) != 0)
134: fatal("%s: %s", __func__, ssh_err(r));
135: return val;
136: }
137:
138: u_int64_t
139: ssh_packet_get_int64(struct ssh *ssh)
140: {
141: u_int64_t val;
142: int r;
143:
144: if ((r = sshpkt_get_u64(ssh, &val)) != 0)
145: fatal("%s: %s", __func__, ssh_err(r));
146: return val;
147: }
148:
1.4 ! djm 149: #ifdef WITH_SSH1
1.1 markus 150: void
151: ssh_packet_get_bignum(struct ssh *ssh, BIGNUM * value)
152: {
153: int r;
154:
155: if ((r = sshpkt_get_bignum1(ssh, value)) != 0)
156: fatal("%s: %s", __func__, ssh_err(r));
157: }
1.4 ! djm 158: #endif
1.1 markus 159:
1.4 ! djm 160: #ifdef WITH_OPENSSL
1.1 markus 161: void
162: ssh_packet_get_bignum2(struct ssh *ssh, BIGNUM * value)
163: {
164: int r;
165:
166: if ((r = sshpkt_get_bignum2(ssh, value)) != 0)
167: fatal("%s: %s", __func__, ssh_err(r));
168: }
169:
170: void
171: ssh_packet_get_ecpoint(struct ssh *ssh, const EC_GROUP *curve, EC_POINT *point)
172: {
173: int r;
174:
175: if ((r = sshpkt_get_ec(ssh, point, curve)) != 0)
176: fatal("%s: %s", __func__, ssh_err(r));
177: }
178: #endif /* WITH_OPENSSL */
179:
180: void *
181: ssh_packet_get_string(struct ssh *ssh, u_int *length_ptr)
182: {
183: int r;
184: size_t len;
185: u_char *val;
186:
187: if ((r = sshpkt_get_string(ssh, &val, &len)) != 0)
188: fatal("%s: %s", __func__, ssh_err(r));
189: if (length_ptr != NULL)
190: *length_ptr = (u_int)len;
191: return val;
192: }
193:
194: const void *
195: ssh_packet_get_string_ptr(struct ssh *ssh, u_int *length_ptr)
196: {
197: int r;
198: size_t len;
199: const u_char *val;
200:
201: if ((r = sshpkt_get_string_direct(ssh, &val, &len)) != 0)
202: fatal("%s: %s", __func__, ssh_err(r));
203: if (length_ptr != NULL)
204: *length_ptr = (u_int)len;
205: return val;
206: }
207:
208: char *
209: ssh_packet_get_cstring(struct ssh *ssh, u_int *length_ptr)
210: {
211: int r;
212: size_t len;
213: char *val;
214:
215: if ((r = sshpkt_get_cstring(ssh, &val, &len)) != 0)
216: fatal("%s: %s", __func__, ssh_err(r));
217: if (length_ptr != NULL)
218: *length_ptr = (u_int)len;
219: return val;
220: }
221:
222: /* Old API, that had to be reimplemented */
223:
224: void
225: packet_set_connection(int fd_in, int fd_out)
226: {
227: active_state = ssh_packet_set_connection(active_state, fd_in, fd_out);
1.3 djm 228: if (active_state == NULL)
229: fatal("%s: ssh_packet_set_connection failed", __func__);
1.1 markus 230: }
231:
232: void
233: packet_backup_state(void)
234: {
235: ssh_packet_backup_state(active_state, backup_state);
236: }
237:
238: void
239: packet_restore_state(void)
240: {
241: ssh_packet_restore_state(active_state, backup_state);
242: }
243:
244: u_int
245: packet_get_char(void)
246: {
247: return (ssh_packet_get_char(active_state));
248: }
249:
250: u_int
251: packet_get_int(void)
252: {
253: return (ssh_packet_get_int(active_state));
254: }
255:
256: int
257: packet_read_seqnr(u_int32_t *seqnr)
258: {
259: u_char type;
260: int r;
261:
1.3 djm 262: if ((r = ssh_packet_read_seqnr(active_state, &type, seqnr)) != 0)
263: sshpkt_fatal(active_state, __func__, r);
1.1 markus 264: return type;
265: }
266:
267: int
268: packet_read_poll_seqnr(u_int32_t *seqnr)
269: {
270: u_char type;
271: int r;
272:
273: if ((r = ssh_packet_read_poll_seqnr(active_state, &type, seqnr)))
1.3 djm 274: sshpkt_fatal(active_state, __func__, r);
1.1 markus 275: return type;
276: }
277:
278: void
279: packet_close(void)
280: {
281: ssh_packet_close(active_state);
282: active_state = NULL;
1.2 djm 283: }
284:
285: void
286: packet_process_incoming(const char *buf, u_int len)
287: {
288: int r;
289:
290: if ((r = ssh_packet_process_incoming(active_state, buf, len)) != 0)
1.3 djm 291: sshpkt_fatal(active_state, __func__, r);
292: }
293:
294: void
295: packet_write_wait(void)
296: {
297: int r;
298:
299: if ((r = ssh_packet_write_wait(active_state)) != 0)
300: sshpkt_fatal(active_state, __func__, r);
301: }
302:
303: void
304: packet_write_poll(void)
305: {
306: int r;
307:
308: if ((r = ssh_packet_write_poll(active_state)) != 0)
309: sshpkt_fatal(active_state, __func__, r);
310: }
311:
312: void
313: packet_read_expect(int expected_type)
314: {
315: int r;
316:
317: if ((r = ssh_packet_read_expect(active_state, expected_type)) != 0)
318: sshpkt_fatal(active_state, __func__, r);
1.1 markus 319: }