Changeset 9178c00 in freewrt for package

Timestamp:

Jun 27, 2007, 5:06:12 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

714149d

Parents:

e42e21d

Message:

make this compile

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2972 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwwif/src

Files:

• Makefile (modified) (3 diffs)
• helper.c (modified) (1 diff)
• md5.c (modified) (1 diff)
• md5.h (modified) (2 diffs)
• md5crypt.c (modified) (1 diff)

package/fwwif/src/Makefile

@@ -1 +1 @@
 XARCH=          mipsel
+CDIAGFLAGS?=    -Wall -Wextra -std=gnu99
 #CROSSROOT?=    /home/tg/Freewrt/cross_${XARCH}
 CROSSROOT?=     ../../../cross_${XARCH}
+
 TOOLPATH=       ${CROSSROOT}/host/bin
 CC=             ${CROSSROOT}/host/${XARCH}-linux-uclibc/bin/gcc
@@ -9 +11 @@
 CFLAGS?=        -Os -fhonour-copts
 CXXFLAGS?=      -Os
-CFLAGS+=        -I${CROSSROOT}/target/usr/include
+CFLAGS+=        -I${CROSSROOT}/target/usr/include ${CDIAGFLAGS}
 CXXFLAGS+=      -I${CROSSROOT}/target/usr/include
 LDFLAGS+=       -L${CROSSROOT}/target/usr/lib
@@ -22 +24 @@
 OBJS=           fwwif.o fwws.o header.o footer.o images.o
 OBJS+=          chpw.o c_chpw.o
+OBJS+=          md5.o md5hl.o md5crypt.o
 CLEANFILES=     ${OBJS} ${OBJS:.o=.cpp} fwwif.so
 IMAGES=         logo.svg favicon.ico
 
 chpw.o c_chpw.o: c_chpw.h common.h
+md5.o md5hl.o md5crypt.o: md5.h
+
+md5hl.c: helper.c
+        sed -e 's/hashinc/md5.h/g' -e 's/HASH/MD5/g' helper.c >$@
 
 images.cpp: ${IMAGES}

package/fwwif/src/helper.c

@@ -21 +21 @@
 #include <unistd.h>
 
-#include <hashinc>
+#include "hashinc"
 
 __RCSID("$MirOS: src/lib/libc/hash/helper.c,v 1.5 2007/05/07 15:21:18 tg Exp $ helper for HASH hash");

package/fwwif/src/md5.c

@@ -20 +20 @@
 #include <sys/types.h>
 #include <string.h>
-#include <md5.h>
+#include "md5.h"
 
 #define PUT_64BIT_LE(cp, value) do {                                    \

package/fwwif/src/md5.h

@@ -4 +4 @@
 #ifndef _MD5_H_
 #define _MD5_H_
+
+#include "common.h"
 
 #define MD5_BLOCK_LENGTH                64
@@ -20 +22 @@
 /* low-level MD5 functions from md5c.c */
 void    MD5Init(MD5_CTX *);
-void    MD5Update(MD5_CTX *, const u_int8_t *, size_t)
-                __attribute__((__bounded__(__string__,2,3)));
+void    MD5Update(MD5_CTX *, const u_int8_t *, size_t);
 void    MD5Pad(MD5_CTX *);
-void    MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *)
-                __attribute__((__bounded__(__minbytes__,1,MD5_DIGEST_LENGTH)));
-void    MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH])
-                __attribute__((__bounded__(__minbytes__,1,4)))
-                __attribute__((__bounded__(__minbytes__,2,MD5_BLOCK_LENGTH)));
+void    MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *);
+void    MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]);
 
 /* high-level functions from mdXhl.c */
-char   *MD5End(MD5_CTX *, char *)
-                __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH)));
-char   *MD5File(const char *, char *)
-                __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH)));
-char   *MD5FileChunk(const char *, char *, off_t, off_t)
-                __attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH)));
-char   *MD5Data(const u_int8_t *, size_t, char *)
-                __attribute__((__bounded__(__string__,1,2)))
-                __attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH)));
+char   *MD5End(MD5_CTX *, char *);
+char   *MD5File(const char *, char *);
+char   *MD5FileChunk(const char *, char *, off_t, off_t);
+char   *MD5Data(const u_int8_t *, size_t, char *);
 __END_DECLS
 

package/fwwif/src/md5crypt.c

@@ -16 +16 @@
 #include <stdio.h>
 #include <string.h>
-#include <md5.h>
+#include "md5.h"
 #include <string.h>