#include <zlib.h>
#endif // HAVE_ZLIB
-#define LAME
+#ifndef RFXSWF_DISABLESOUND
+#ifdef HAVE_LAME
#include "lame/lame.h"
+#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);
int swf_WriteTag(int handle, TAG * t)
{
struct writer_t writer;
+ int len = 0;
if(handle<0)
return swf_WriteTag2(0, t);
writer_init_filewriter(&writer, handle);
- return swf_WriteTag2(&writer, t);
+ len = swf_WriteTag2(&writer, t);
+ writer.finish(&writer);
+ return len;
}
int swf_DefineSprite_GetRealSize(TAG * t)
int frameCount=0;
struct writer_t zwriter;
int fileSize = 0;
+ int inSprite = 0;
+ int writer_lastpos = 0;
if (!swf) return -1;
+ if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
+
+ if(writer) writer_lastpos = writer->pos;
// Insert REFLEX Tag
if (swf->firstTag && swf_NextTag(swf->firstTag))
if (swf_GetTagID(swf_NextTag(swf->firstTag))!=ST_REFLEX)
- swf_SetBlock(swf_InsertTag(swf->firstTag,ST_REFLEX),"rfx",3);
+ swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),"rfx",3);
#endif // INSERT_RFX_TAG
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;
if(swf->compressed != 8) {
/* compressed flag set to 8 means "skip first 8
header bytes". This is necessary if the caller wants to
- create compressed SWFs himself */
+ create compressed SWFs himself .
+ It also means that we don't initialize our own zlib
+ writer, but assume the caller provided one.
+ */
if(swf->compressed) {
char*id = "CWS";
writer->write(writer, id, 3);
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
- if (writer)
- {
- int ret = writer->write(writer,b,swf_GetTagLen(&t1));
- if (ret!=swf_GetTagLen(&t1))
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr, "ret:%d\n",ret);
- perror("write:");
- fprintf(stderr,"WriteSWF() failed: Header.\n");
- #endif
- return -1;
- }
+ int ret = writer->write(writer,b,swf_GetTagLen(&t1));
+ if (ret!=swf_GetTagLen(&t1))
+ {
+ #ifdef DEBUG_RFXSWF
+ fprintf(stderr, "ret:%d\n",ret);
+ perror("write:");
+ fprintf(stderr,"WriteSWF() failed: Header.\n");
+ #endif
+ return -1;
+ }
- t = swf->firstTag;
- while (t)
- { if (swf_WriteTag2(writer, t)<0) return -1;
- t = swf_NextTag(t);
+ t = swf->firstTag;
+ while (t)
+ { if (swf_WriteTag2(writer, t)<0) return -1;
+ t = swf_NextTag(t);
+ }
+ if(swf->compressed) {
+ if(swf->compressed != 8) {
+ zwriter.finish(&zwriter);
+ return writer->pos - writer_lastpos;
}
- if(swf->compressed != 8)
- writer->finish(writer); // flush zlib buffers - only if _we_ initialized that writer.
+ return (int)fileSize;
+ } else {
+ return (int)fileSize;
}
}
- return (int)fileSize;
}
int swf_WriteSWF(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
struct writer_t writer;
+ int len = 0;
swf->compressed = 0;
+
if(handle<0) {
writer_init_nullwriter(&writer);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
}
writer_init_filewriter(&writer, handle);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
+ writer.finish(&writer);
+ return len;
}
int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
struct writer_t writer;
+ int len = 0;
swf->compressed = 1;
+
if(handle<0) {
writer_init_nullwriter(&writer);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
}
writer_init_filewriter(&writer, handle);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
+ writer.finish(&writer);
+ return len;
}
int swf_WriteHeader2(struct writer_t*writer,SWF * swf)
git.asbjorn.biz / swftools.git / blobdiff