add-base64-encode-decode.patch

Signed-off-by: Andy Green <andy@warmcat.com>

lib/Makefile.am

@@ -4,6 +4,7 @@ dist_libwebsockets_la_SOURCES=libwebsockets.c \
 				handshake.c \
 				parsers.c \
 				libwebsockets.h \
+				base64-decode.c \
 				private-libwebsockets.h
 libwebsockets_la_CFLAGS=-Wall -Werror -std=gnu99 -pedantic -rdynamic -fPIC -c
 libwebsockets_la_LDFLAGS=-version-info 0:2 -lcrypto

lib/Makefile.in

@@ -71,7 +71,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libwebsockets_la_LIBADD =
 dist_libwebsockets_la_OBJECTS = libwebsockets_la-libwebsockets.lo \
-	libwebsockets_la-handshake.lo libwebsockets_la-parsers.lo
+	libwebsockets_la-handshake.lo libwebsockets_la-parsers.lo \
+	libwebsockets_la-base64-decode.lo
 libwebsockets_la_OBJECTS = $(dist_libwebsockets_la_OBJECTS)
 libwebsockets_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libwebsockets_la_CFLAGS) \
@@ -214,6 +215,7 @@ dist_libwebsockets_la_SOURCES = libwebsockets.c \
 				handshake.c \
 				parsers.c \
 				libwebsockets.h \
+				base64-decode.c \
 				private-libwebsockets.h
 
 libwebsockets_la_CFLAGS = -Wall -Werror -std=gnu99 -pedantic -rdynamic -fPIC -c
@@ -292,6 +294,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwebsockets_la-base64-decode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwebsockets_la-handshake.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwebsockets_la-libwebsockets.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwebsockets_la-parsers.Plo@am__quote@
@@ -338,6 +341,13 @@ libwebsockets_la-parsers.lo: parsers.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwebsockets_la_CFLAGS) $(CFLAGS) -c -o libwebsockets_la-parsers.lo `test -f 'parsers.c' || echo '$(srcdir)/'`parsers.c
 
+libwebsockets_la-base64-decode.lo: base64-decode.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwebsockets_la_CFLAGS) $(CFLAGS) -MT libwebsockets_la-base64-decode.lo -MD -MP -MF $(DEPDIR)/libwebsockets_la-base64-decode.Tpo -c -o libwebsockets_la-base64-decode.lo `test -f 'base64-decode.c' || echo '$(srcdir)/'`base64-decode.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libwebsockets_la-base64-decode.Tpo $(DEPDIR)/libwebsockets_la-base64-decode.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='base64-decode.c' object='libwebsockets_la-base64-decode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwebsockets_la_CFLAGS) $(CFLAGS) -c -o libwebsockets_la-base64-decode.lo `test -f 'base64-decode.c' || echo '$(srcdir)/'`base64-decode.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

lib/base64-decode.c

@@ -0,0 +1,196 @@
+/*
+ * This code originally came from here
+ *
+ * http://base64.sourceforge.net/b64.c
+ *
+ * with the following license:
+ *
+ * LICENCE:        Copyright (c) 2001 Bob Trower, Trantor Standard Systems Inc.
+ *
+ *                Permission is hereby granted, free of charge, to any person
+ *                obtaining a copy of this software and associated
+ *                documentation files (the "Software"), to deal in the
+ *                Software without restriction, including without limitation
+ *                the rights to use, copy, modify, merge, publish, distribute,
+ *                sublicense, and/or sell copies of the Software, and to
+ *                permit persons to whom the Software is furnished to do so,
+ *                subject to the following conditions:
+ *
+ *                The above copyright notice and this permission notice shall
+ *                be included in all copies or substantial portions of the
+ *                Software.
+ *
+ *                THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ *                KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ *                WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ *                PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ *                OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *                OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ *                OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *                SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * VERSION HISTORY:
+ *               Bob Trower 08/04/01 -- Create Version 0.00.00B
+ *
+ * I cleaned it up quite a bit to match the (linux kernel) style of the rest
+ * of libwebsockets; this version is under LGPL2 like the rest of libwebsockets
+ * since he explictly allows sublicensing, but I give the URL above so you can
+ * get the original with Bob's super-liberal terms directly if you prefer.
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+
+static const char encode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			     "abcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char decode[] = "|$$$}rstuvwxyz{$$$$$$$>?@ABCDEFGHIJKLMNOPQRSTUVW"
+			     "$$$$$$XYZ[\\]^_`abcdefghijklmnopq";
+
+int
+lws_b64_encode_string(const char *in, char *out, int out_size)
+{
+	unsigned char triple[3];
+	int i;
+	int len;
+	int line = 0;
+	int done = 0;
+
+	while (*in) {
+		len = 0;
+		for (i = 0; i < 3; i++) {
+			if (*in) {
+				triple[i] = *in++;
+				len++;
+			} else
+				triple[i] = 0;
+		}
+		if (len) {
+
+			if (done + 4 >= out_size)
+				return -1;
+
+			*out++ = encode[triple[0] >> 2];
+			*out++ = encode[((triple[0] & 0x03) << 4) |
+						     ((triple[1] & 0xf0) >> 4)];
+			*out++ = (len > 1 ? encode[((triple[1] & 0x0f) << 2) |
+					     ((triple[2] & 0xc0) >> 6)] : '=');
+			*out++ = (len > 2 ? encode[triple[2] & 0x3f] : '=');
+
+			done += 4;
+			line += 4;
+		}
+		if (line >= 72) {
+
+			if (done + 2 >= out_size)
+				return -1;
+
+			*out++ = '\r';
+			*out++ = '\n';
+			done += 2;
+			line = 0;
+		}
+	}
+
+	if (done + 1 >= out_size)
+		return -1;
+
+	*out++ = '\0';
+
+	return done;
+}
+
+/*
+ * returns length of decoded string in out, or -1 if out was too small
+ * according to out_size
+ */
+
+int
+lws_b64_decode_string(const char *in, char *out, int out_size)
+{
+	int len;
+	int i;
+	int done = 0;
+	unsigned char v;
+	unsigned char quad[4];
+
+	while (*in) {
+
+		len = 0;
+		for (i = 0; i < 4 && *in; i++) {
+
+			v = 0;
+			while (*in && !v) {
+
+				v = *in++;
+				v = (v < 43 || v > 122) ? 0 : decode[v - 43];
+				if (v)
+					v = (v == '$') ? 0 : v - 61;
+				if (*in) {
+					len++;
+					if (v)
+						quad[i] = v - 1;
+				} else
+					quad[i] = 0;
+			}
+		}
+		if (!len)
+			continue;
+
+		if (out_size < (done + len - 1))
+			/* out buffer is too small */
+			return -1;
+
+		if (len >= 2)
+			*out++ = quad[0] << 2 | quad[1] >> 4;
+		if (len >= 3)
+			*out++ = quad[1] << 4 | quad[2] >> 2;
+		if (len >= 4)
+			*out++ = ((quad[2] << 6) & 0xc0) | quad[3];
+
+		done += len - 1;
+	}
+
+	if (done + 1 >= out_size)
+		return -1;
+
+	*out++ = '\0';
+
+	return done;
+}
+
+int
+lws_b64_selftest(void)
+{
+	char buf[64];
+	int n;
+	int test;
+	static const char *plaintext[] = {
+		"sanity check base 64"
+	};
+	static const char *coded[] = {
+		"c2FuaXR5IGNoZWNrIGJhc2UgNjQ="
+	};
+
+	for (test = 0; test < sizeof plaintext / sizeof(plaintext[0]); test++) {
+
+		buf[sizeof(buf) - 1] = '\0';
+		n = lws_b64_encode_string(plaintext[test], buf, sizeof buf);
+		if (n != strlen(coded[test]) || strcmp(buf, coded[test])) {
+			fprintf(stderr, "Failed lws_b64 encode selftest "
+					   "%d result '%s' %d\n", test, buf, n);
+			return -1;
+		}
+
+		buf[sizeof(buf) - 1] = '\0';
+		n = lws_b64_decode_string(coded[test], buf, sizeof buf);
+		if (n != strlen(plaintext[test]) ||
+						 strcmp(buf, plaintext[test])) {
+			fprintf(stderr, "Failed lws_b64 decode selftest "
+					   "%d result '%s' %d\n", test, buf, n);
+			return -1;
+		}
+	}
+
+	return 0;
+}

lib/libwebsockets.c

@@ -320,6 +320,12 @@ int libwebsocket_create_server(int port,
 	}
 #endif
 
+	/* selftest */
+
+	if (lws_b64_selftest())
+		return -1;
+
+
 	this = malloc(sizeof(struct libwebsocket_context));
 
 	/* set up our external listening socket we serve on */

lib/private-libwebsockets.h

@@ -173,3 +173,12 @@ libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi,
 
 extern int
 libwebsocket_read(struct libwebsocket *wsi, unsigned char * buf, size_t len);
+
+extern int
+lws_b64_encode_string(const char *in, char *out, int out_size);
+
+extern int
+lws_b64_decode_string(const char *in, char *out, int out_size);
+
+extern int
+lws_b64_selftest(void);

libwebsockets.spec

@@ -1,6 +1,6 @@
 Name: libwebsockets
 Version: 0.1
-Release: 35.gmaster_8322b370%{?dist}
+Release: 41.gmaster_91ef816b%{?dist}
 Summary: Websocket Server Library
 
 Group: System