summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2013-11-01 18:32:51 +0100
committertv <tv@nomic.retiolum>2013-11-01 18:32:51 +0100
commit4ac7de7c606ab9e7fe0aac63b3c8ca8b2be09a36 (patch)
tree072a4fba75520cbcc15a7987a19c6a79fb59a090
parent5e3c03f8657f6666e7f71a31a9444e9db2f659d0 (diff)
parente71f7dde60f687c3fb037d2e4d2b0ada608e512d (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--god/claws/rcontrol.c2
-rw-r--r--retiolum/hosts/kabinett16
2 files changed, 9 insertions, 9 deletions
diff --git a/god/claws/rcontrol.c b/god/claws/rcontrol.c
index 972c97d0..eaa66b89 100644
--- a/god/claws/rcontrol.c
+++ b/god/claws/rcontrol.c
@@ -61,7 +61,7 @@ void exit_gracefully(struct ftdi_context* ftdic, char exit_code);
int main(int argc, char **argv)
{
int ret=0, int_argument=0, option_flags=0, long_index=0, i=0, num_ops=0;
- char c=0;
+ signed char c=0;
unsigned char buf[COMMANDO_LENGTH], char_argument=0, operation=0;
const char* ft_serial=DEFAULT_FT_SERIAL;
double double_argument;
diff --git a/retiolum/hosts/kabinett b/retiolum/hosts/kabinett
index 3e25e84c..e434d419 100644
--- a/retiolum/hosts/kabinett
+++ b/retiolum/hosts/kabinett
@@ -1,11 +1,11 @@
-Subnet = 10.243.152.16
-Subnet = 42:b02f:92dc:7e87:c43e:d038:d7e8:e37a
+Subnet = 10.243.213.120
+Subnet = 42:e792:1d5c:c89f:f932:e954:6ada:1dbf
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAp/JSFNCRrCDPrck/L63reWa9iyowqE1luixmC5YTipg6x8LR0+l4
-WloHKzfvTEeK1eBq2v0a9MPc+/KbAACezId3iRqS7b1cv9EPjoa449m4Ti5KYdYv
-SZ974Zd1xS9t3cMsax6SAN0JMhh5t0/xb3hXBnb/YPkwQ+urj87ddAhvcs2XtEQ2
-+Z6BPcrQzU9lkGzQkRgmk9O1PLA8cRbhxuBbk/gI90q4UwuP+VjGyKsqz9eJs24j
-n1dRVGYP5nv1L0nL8qZsY/rKfTv0RJC1LIUcc0W9G4xy/fCL9FYaCGRzWEdbptCW
-i5gIY3dIOBJo0aZsrsfz3idug72adTMLXQIDAQAB
+MIIBCgKCAQEA1sVtqyeCdKB1nabs0FOC62J+J+grP5B/3/s1cuAxcJmER+NaT/Kv
+rvQeB13BmrIjfJTBaezdR+wp0RiPB7s/aMPjWwS5rzh3KhSFk2SFpnLjB2WIpKqs
+N9TQEf2xB0TBWHqcpSqSthjP3SOGNP7gt5l0D13QIHkRQ2xX1PqYikkYi07cQLO4
+rwXrlEBOY8Dn0GR37NA0k+zt0AIdJ78zXHNjVn5hRj8aLGKB0q/FOtdMNRYEGD40
+An82Y2sW+b7U6Tnrw43TOO+AP/OrclEjmNDTRqYLiVAeFHXKjwbCsSlof0qmoipZ
+H+nbsB3qkFpNEy1cA9c/pqHfSpqV3WihRQIDAQAB
-----END RSA PUBLIC KEY-----