Merge branch 'raspbian/wheezy' into raspbian/jessie

CMakeLists.txt

@@ -5,7 +5,7 @@ include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
 
 set(MOONLIGHT_MAJOR_VERSION 2)
 set(MOONLIGHT_MINOR_VERSION 1)
-set(MOONLIGHT_PATCH_VERSION 3)
+set(MOONLIGHT_PATCH_VERSION 4)
 set(MOONLIGHT_VERSION ${MOONLIGHT_MAJOR_VERSION}.${MOONLIGHT_MINOR_VERSION}.${MOONLIGHT_PATCH_VERSION})
 
 aux_source_directory(./src SRC_LIST)

debian/changelog

@@ -1,4 +1,14 @@
+<<<<<<< HEAD
 moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high
+=======
+moonlight-embedded (2.1.4-1wheezy1) RELEASED; urgency=high
+
+  * Update to version 2.1.4
+
+ -- Iwan Timmer <irtimmer@gmail.com>  Tue, 1 Mar 2016 20:23:54 +0200
+
+moonlight-embedded (2.1.3-1wheezy1) RELEASED; urgency=high
+>>>>>>> raspbian/wheezy
 
   * Update to version 2.1.3
 

libgamestream/client.c

@@ -337,17 +337,18 @@ int gs_pair(PSERVER_DATA server, char* pin) {
 
   unsigned char salt_pin[20];
   unsigned char aes_key_hash[20];
-  AES_KEY aes_key;
+  AES_KEY enc_key, dec_key;
   memcpy(salt_pin, salt_data, 16);
-  memcpy(salt_pin+16, salt_pin, 4);
+  memcpy(salt_pin+16, pin, 4);
   SHA1(salt_pin, 20, aes_key_hash);
-  AES_set_encrypt_key((unsigned char *)aes_key_hash, 128, &aes_key);
+  AES_set_encrypt_key((unsigned char *)aes_key_hash, 128, &enc_key);
+  AES_set_decrypt_key((unsigned char *)aes_key_hash, 128, &dec_key);
 
   unsigned char challenge_data[16];
   unsigned char challenge_enc[16];
   char challenge_hex[33];
   RAND_bytes(challenge_data, 16);
-  AES_encrypt(challenge_data, challenge_enc, &aes_key);
+  AES_encrypt(challenge_data, challenge_enc, &enc_key);
   bytes_to_hex(challenge_enc, challenge_hex, 16);
 
   uuid_generate_random(uuid);
@@ -364,13 +365,13 @@ int gs_pair(PSERVER_DATA server, char* pin) {
 
   char challenge_response_data_enc[48];
   char challenge_response_data[48];
-  for (int count = 0; count < strlen(result); count++) {
+  for (int count = 0; count < strlen(result); count += 2) {
     sscanf(&result[count], "%2hhx", &challenge_response_data_enc[count / 2]);
   }
   free(result);
 
   for (int i = 0; i < 48; i += 16) {
-    AES_decrypt(&challenge_response_data_enc[i], &challenge_response_data[i], &aes_key);
+    AES_decrypt(&challenge_response_data_enc[i], &challenge_response_data[i], &dec_key);
   }
 
   char client_secret_data[16];
@@ -379,14 +380,14 @@ int gs_pair(PSERVER_DATA server, char* pin) {
   char challenge_response[16 + 256 + 16];
   char challenge_response_hash[32];
   char challenge_response_hash_enc[32];
-  char challenge_response_hex[33];
+  char challenge_response_hex[65];
   memcpy(challenge_response, challenge_response_data + 20, 16);
   memcpy(challenge_response + 16, cert->signature->data, 256);
   memcpy(challenge_response + 16 + 256, client_secret_data, 16);
   SHA1(challenge_response, 16 + 256 + 16, challenge_response_hash);
 
   for (int i = 0; i < 32; i += 16) {
-    AES_encrypt(&challenge_response_hash[i], &challenge_response_hash_enc[i], &aes_key);
+    AES_encrypt(&challenge_response_hash[i], &challenge_response_hash_enc[i], &enc_key);
   }
   bytes_to_hex(challenge_response_hash_enc, challenge_response_hex, 32);
 

mappings/xbox360.conf

@@ -5,8 +5,8 @@ abs_rx = 3
 abs_ry = 4
 abs_rz = 9
 abs_deadzone = 0
-abs_dpad_x = 16
-abs_dpad_y = 17
+abs_dpad_x = 17
+abs_dpad_y = 16
 reverse_x = false
 reverse_y = true
 reverse_rx = false
@@ -24,8 +24,8 @@ btn_thumbl = 317
 btn_thumbr = 318
 btn_tl = 310
 btn_tr = 311
-btn_tl2 = -1
-btn_tr2 = -1
+btn_tl2 = 312
+btn_tr2 = 313
 btn_dpad_up = -1
 btn_dpad_down = -1
 btn_dpad_left = -1

src/video/sdl.c

@@ -30,7 +30,6 @@
 
 #define DECODER_BUFFER_SIZE 92*1024
 
-static int screen_width, screen_height;
 static char* ffmpeg_buffer;
 
 static void sdl_setup(int width, int height, int redrawRate, void* context, int drFlags) {
@@ -45,9 +44,6 @@ static void sdl_setup(int width, int height, int redrawRate, void* context, int
     fprintf(stderr, "Not enough memory\n");
     exit(1);
   }
-
-  screen_width = width;
-  screen_height = height;
 }
 
 static void sdl_cleanup() {

third_party/libcec/ceccloader.h

@@ -225,7 +225,7 @@ static libcecc_lib_instance_t libcecc_load_library(const char* strLib)
   #if defined(__APPLE__)
     lib =  dlopen(strLib ? strLib : "libcec." CEC_LIB_VERSION_MAJOR_STR ".dylib", RTLD_LAZY);
   #else
-    lib = dlopen(strLib ? strLib : "libcec.so." CEC_LIB_VERSION_MAJOR_STR ".0", RTLD_LAZY);
+    lib = dlopen(strLib ? strLib : "libcec.so." CEC_LIB_VERSION_MAJOR_STR, RTLD_LAZY);
   #endif
   if (lib == NULL)
     printf("%s\n", dlerror());