mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-03 13:35:36 +00:00
Code Issues Releases Wiki Activity

Fix libb64 unsigned char issues while waiting for upstream to accept the patch

Browse source
This commit is contained in:
Mike Gelfand 2015-03-14 06:59:44 +00:00
parent 2331cee776
commit 4072ff2a21
4 changed files with 65 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -275,7 +275,8 @@ endif()
tr_add_external_auto_library(B64 b64 tr_add_external_auto_library(B64 b64
PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/b64.cmake" "<SOURCE_DIR>/CMakeLists.txt" PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${THIRD_PARTY_DIR}/b64.cmake" "<SOURCE_DIR>/CMakeLists.txt"
COMMAND "${CMAKE_COMMAND}" -E chdir "<SOURCE_DIR>" patch -p1 -i "${THIRD_PARTY_DIR}/b64-01-newline.patch") COMMAND "${CMAKE_COMMAND}" -E chdir "<SOURCE_DIR>" patch -p1 -i "${THIRD_PARTY_DIR}/b64-01-newline.patch"
COMMAND "${CMAKE_COMMAND}" -E chdir "<SOURCE_DIR>" patch -p1 -i "${THIRD_PARTY_DIR}/b64-02-unsigned-char.patch")
if(WITH_INOTIFY) if(WITH_INOTIFY)
tr_get_required_flag(WITH_INOTIFY INOTIFY_IS_REQUIRED) tr_get_required_flag(WITH_INOTIFY INOTIFY_IS_REQUIRED)

1
third-party/b64-01-newline.patch vendored
View file

@ -1,5 +1,4 @@
diff --git a/src/cencode.c b/src/cencode.c diff --git a/src/cencode.c b/src/cencode.c
index 03ba5b6..de3902f 100644
--- a/src/cencode.c --- a/src/cencode.c
+++ b/src/cencode.c +++ b/src/cencode.c
@@ -7,7 +7,9 @@ For details, see http://sourceforge.net/projects/libb64 @@ -7,7 +7,9 @@ For details, see http://sourceforge.net/projects/libb64

57
third-party/b64-02-unsigned-char.patch vendored Normal file
View file

@ -0,0 +1,57 @@
diff --git a/src/cdecode.c b/src/cdecode.c
--- a/src/cdecode.c
+++ b/src/cdecode.c
@@ -9,7 +9,7 @@
int base64_decode_value(char value_in)
{
- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
static const char decoding_size = sizeof(decoding);
value_in -= 43;
if (value_in < 0 || value_in >= decoding_size) return -1;
@@ -26,7 +26,7 @@
{
const char* codechar = code_in;
char* plainchar = plaintext_out;
- char fragment;
+ int fragment;
*plainchar = state_in->plainchar;
@@ -42,7 +42,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar = (fragment & 0x03f) << 2;
case step_b:
@@ -53,7 +53,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x030) >> 4;
*plainchar = (fragment & 0x00f) << 4;
@@ -65,7 +65,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x03c) >> 2;
*plainchar = (fragment & 0x003) << 6;
@@ -77,7 +77,7 @@
state_in->plainchar = *plainchar;
return plainchar - plaintext_out;
}
- fragment = (char)base64_decode_value(*codechar++);
+ fragment = base64_decode_value(*codechar++);
} while (fragment < 0);
*plainchar++ |= (fragment & 0x03f);
}

12
third-party/libb64/cdecode.c vendored
View file

@ -9,7 +9,7 @@ For details, see http://sourceforge.net/projects/libb64
int base64_decode_value(char value_in) int base64_decode_value(char value_in)
{ {
static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
static const char decoding_size = sizeof(decoding); static const char decoding_size = sizeof(decoding);
value_in -= 43; value_in -= 43;
if (value_in < 0 || value_in >= decoding_size) return -1; if (value_in < 0 || value_in >= decoding_size) return -1;
@ -26,7 +26,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
{ {
const char* codechar = code_in; const char* codechar = code_in;
char* plainchar = plaintext_out; char* plainchar = plaintext_out;
char fragment; int fragment;
*plainchar = state_in->plainchar; *plainchar = state_in->plainchar;
@ -42,7 +42,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = base64_decode_value(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar = (fragment & 0x03f) << 2; *plainchar = (fragment & 0x03f) << 2;
case step_b: case step_b:
@ -53,7 +53,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = base64_decode_value(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x030) >> 4; *plainchar++ |= (fragment & 0x030) >> 4;
*plainchar = (fragment & 0x00f) << 4; *plainchar = (fragment & 0x00f) << 4;
@ -65,7 +65,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = base64_decode_value(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x03c) >> 2; *plainchar++ |= (fragment & 0x03c) >> 2;
*plainchar = (fragment & 0x003) << 6; *plainchar = (fragment & 0x003) << 6;
@ -77,7 +77,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
state_in->plainchar = *plainchar; state_in->plainchar = *plainchar;
return plainchar - plaintext_out; return plainchar - plaintext_out;
} }
fragment = (char)base64_decode_value(*codechar++); fragment = base64_decode_value(*codechar++);
} while (fragment < 0); } while (fragment < 0);
*plainchar++ |= (fragment & 0x03f); *plainchar++ |= (fragment & 0x03f);
} }