#endif
#endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+
#include "./bitio.h"
#include "./MD5.h"
void swf_SetPassword(TAG * t, const char * password)
{
/* WARNING: crypt_md5 is not reentrant */
- char* md5string = crypt_md5(password, "salt"); /* FIXME- get random salt */
+ char salt[3];
+ char* md5string;
+
+#if defined(HAVE_LRAND48) && defined(HAVE_SRAND48) && defined(HAVE_TIME_H) && defined(HAVE_TIME)
+ srand48(time(0));
+ salt[0] = "abcdefghijklmnopqrstuvwxyz0123456789"[lrand48()%36];
+ salt[1] = "abcdefghijklmnopqrstuvwxyz0123456789"[lrand48()%36];
+#else
+ salt[0] = 'l';
+ salt[1] = '8';
+ fprintf(stderr, "rfxswf: Warning- no usable random generator found\n");
+ fprintf(stderr, "Your password will be vulnerable to dictionary attacks\n");
+#endif
+
+ md5string = crypt_md5(password, salt);
+
+ swf_SetU16(t,0);
swf_SetString(t, md5string);
}
char*md5, *salt;
int n;
+ if(t->len >= 5 && t->pos==0 &&
+ t->data[0] == 0 &&
+ t->data[1] == 0) {
+ swf_GetU16(t);
+ } else {
+ printf("%d %d %d %d\n", t->len, t->pos, t->data[0], t->data[1]);
+ }
+
md5string1 = swf_GetString(t);
- if(!strncmp(md5string1, "$1$",3 )) {
+ if(strncmp(md5string1, "$1$",3 )) {
+ fprintf(stderr, "rfxswf: no salt in pw string\n");
return 0;
}
x = strchr(md5string1+3, '$');
- if(!x)
+ if(!x) {
+ fprintf(stderr, "rfxswf: invalid salt format in pw string\n");
return 0;
+ }
n = x-(md5string1+3);
salt = (char*)malloc(n+1);
memcpy(salt, md5string1+3, n);
}
}
+void swf_FoldAllTags(TAG*tag)
+{
+ SWF swf;
+ memset(&swf, 0, sizeof(swf));
+ swf.firstTag = tag;
+ swf_FoldAll(&swf);
+}
+
void swf_UnFoldAll(SWF*swf)
{
TAG*tag = swf->firstTag;
int frameCount=0;
struct writer_t zwriter;
int fileSize = 0;
+ int inSprite = 0;
if (!swf) return -1;
t = swf->firstTag;
frameCount = 0;
- while(t)
- { len += swf_WriteTag(-1, t);
- if (t->id==ST_SHOWFRAME) frameCount++;
- t = swf_NextTag(t);
+ while(t) {
+ len += swf_WriteTag(-1,t);
+ if(t->id == ST_DEFINESPRITE) inSprite++;
+ else if(t->id == ST_END && inSprite) inSprite--;
+ else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++;
+ t = swf_NextTag(t);
}
{ TAG t1;