On 14 February, 2013 - Fabio Pietrosanti (naif) wrote:
> On 2/14/13 8:36 AM, Jacob Appelbaum wrote:
> > The live code review with ascii art was really something to behold. It
> > was some kind of new art form that isn't very good but at the same time
> > is nearly impossible to not watch...
> Something interesting happened yesterday, here a summary in case someone
> would like to get on it again
>
> * After few hours the pad was vandalized insulting nadim
> https://pad.riseup.net/p/silentcircle
>
> * A Backup of the Pad content has been put read-only online (with some
> comments and further analysis to be done)
> * http://pastebit.com/pastie/12001
> * http://pastebin.com/dKRPrGMN
>
> * SilentCircle source code has been temporarly removed from Github:
> https://github.com/SilentCircle/silent-phone-base
>
> * Nadim opened a ticket to ask about the code back:
> https://github.com/SilentCircle/silent-phone-base/issues/1
>
> * A new (different) version of the code has been uploaded online:
> https://github.com/SilentCircle/silent-phone-base
>
> * Someone in the meantime put the original code back online (as a zip
> archive):
> http://jednorog.sneakyness.com/1U060B2S3I1P
>
> * A diff between the "original SC opensource release" and the "modified
> SC opensource release" reveal some code difference
> * Output of git diff "original/silent-phone-base new/silent-phone-base/
> > sc.patch" is available at
> http://temp-share.com/show/f3Yg95cXn
>
> -naif
> --
> Unsubscribe, change to digest, or change password at:
> https://mailman.stanford.edu/mailman/listinfo/liberationtech
A quick scan through the patch seems to indicate it is _mostly_
formatting changes.
A version bump 14322 to 14326 on the CFBundleVersion.
And various license headers (BSD-style afaict - not a license expert)
Oh, and they removed an snprintf, and const-declared an argument.
Also a new android make file and a tina_exp.h header.
All in all, nothing _too_ exciting I don't think...
Non-formatting/licensing changes extracted below:
diff --git
a/original/silent-phone-base/silentphone/apple/ios/Classes/CallManeger.mm
b/new/silent-phone-base/silentphone/apple/ios/Classes/CallManeger.mm
index ac8cf87..d185e90 100644
--- a/original/silent-phone-base/silentphone/apple/ios/Classes/CallManeger.mm
+++ b/new/silent-phone-base/silentphone/apple/ios/Classes/CallManeger.mm
@@ -70,7 +70,7 @@ NSString *toNSFromTB(CTStrBase *b);
}
-(void)redraw{
-
+
if(!calls->getCallCnt()){
[[self navigationController] popViewControllerAnimated:YES];
return;
@@ -99,14 +99,14 @@ NSString *toNSFromTB(CTStrBase *b);
- (id)initWithStyle:(UITableViewStyle)style
{
...
- (void) viewWillAppear:(BOOL)animated
@@ -129,7 +129,7 @@ NSString *toNSFromTB(CTStrBase *b);
- (void)viewDidDisappear:(BOOL)animated{
...
@@ -143,22 +143,22 @@ NSString *toNSFromTB(CTStrBase *b);
...
}
- (void)viewDidUnload
{
...
@@ -166,18 +166,18 @@ NSString *toNSFromTB(CTStrBase *b);
-
(BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
...
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
...
- (NSInteger)tableView:(UITableView *)tableView
numberOfRowsInSection:(NSInteger)section
...
@@ -188,13 +188,13 @@ NSString *toNSFromTB(CTStrBase *b);
...
-(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell
*)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
...
@@ -207,7 +207,7 @@ NSString *toNSFromTB(CTStrBase *b);
...
- (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath
...
@@ -486,14 +492,14 @@ NSString *toNSFromTB(CTStrBase *b);
- (void)tableView:(UITableView *)tableView
didSelectRowAtIndexPath:(NSIndexPath *)indexPath
...
diff --git
a/original/silent-phone-base/silentphone/apple/ios/VoipPhone/VoipPhone-Info.plist
b/new/silent-phone-base/silentphone/apple/ios/VoipPhone/VoipPhone-Info.plist
index 319dbde..0431a76 100755
---
a/original/silent-phone-base/silentphone/apple/ios/VoipPhone/VoipPhone-Info.plist
+++ b/new/silent-phone-base/silentphone/apple/ios/VoipPhone/VoipPhone-Info.plist
<key>CFBundleVersion</key>
- <string>14322</string>
+ <string>14326</string>
diff --git
a/new/silent-phone-base/silentphone/codecs/vTiVi/android/jni/Android.mk
b/new/silent-phone-base/silentphone/codecs/vTiVi/android/jni/Android.mk
new file mode 100644
...
diff --git
a/new/silent-phone-base/silentphone/codecs/vTiVi/android/jni/tina_exp.h
b/new/silent-phone-base/silentphone/codecs/vTiVi/android/jni/tina_exp.h
new file mode 100644
...
diff --git
a/original/silent-phone-base/silentphone/encrypt/zrtp/libwerner_zrtp.a
b/original/silent-phone-base/silentphone/encrypt/zrtp/libwerner_zrtp.a
deleted file mode 100644
...
diff --git a/original/silent-phone-base/silentphone/utils/CTCoutryCode.cpp
b/new/silent-phone-base/silentphone/utils/CTCoutryCode.cpp
index dd67a09..a36db86 100755
--- a/original/silent-phone-base/silentphone/utils/CTCoutryCode.cpp
+++ b/new/silent-phone-base/silentphone/utils/CTCoutryCode.cpp
@@ -430,6 +430,8 @@ int fixNR(void *p, const char *in, char *out, int iLenMax){
else if(in[0]=='0' && in[1]=='0'){ iCheckCC=1;}
// else {strncpy(out,in,iLenMax);out[iLenMax]=0;return 0;}
+ if(in[0]=='.'){strncpy(out,in,iLenMax);out[iLenMax]=0;return 1;}
+
...
@@ -474,6 +476,8 @@ int findCSC_C_S(const char *nr, char *szCountry, char
*szCity, char *szID, int i
...
+ if(l && tmp[0]=='.')return 0;
...
diff --git a/original/silent-phone-base/silentphone/xml/parse_xml.cpp
b/new/silent-phone-base/silentphone/xml/parse_xml.cpp
index 937d86b..bcde78b 100755
--- a/original/silent-phone-base/silentphone/xml/parse_xml.cpp
+++ b/new/silent-phone-base/silentphone/xml/parse_xml.cpp
@@ -979,7 +979,7 @@ void storeXML_W(const short *pszFileName, NODE *node){
#else
char bufFn[1024];
- void convert16to8S(char *dst, int iMaxDstSize, short *src, int iLen);
+ void convert16to8S(char *dst, int iMaxDstSize, const short *src, int iLen);
--
Petter Ericson (pett...@acc.umu.se)
--
Unsubscribe, change to digest, or change password at:
https://mailman.stanford.edu/mailman/listinfo/liberationtech
