New base64enc example program, based on code contributed by Jeronimo Pellegrini.

diff --git a/ChangeLog b/ChangeLog
index 06167790d059806c9cdb2b6702ff5c08fe7201f8..f4c33559721474e0de50de53eff236c4375bdef4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-04-14  Niels Möller  <nisse@lysator.liu.se>
 
+       * examples/Makefile.in (base64enc): New target. Also added missing
+       io.o dependency to several other targets.
+
+       * examples/base64enc.c: New file, based on example code
+       contributed by Jeronimo Pellegrini.
+
        * examples/rsa-encrypt.c (process_file): Reorganized fread loop.
        (usage): New function.
        (main): Implemented --help option.

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 4746a2007ad93aa944b3f5dfeefd4ce67a77ed70..1b6abfe1c108f84d07e9487270c44f632f29e3e5 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -15,11 +15,15 @@ BENCH_LIBS = @BENCH_LIBS@
 
 RSA_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \
              rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT)
-TARGETS = nettle-benchmark$(EXEEXT) eratosthenes$(EXEEXT) @IF_HOGWEED@ $(RSA_TARGETS) next-prime$(EXEEXT) random-prime$(EXEEXT)
+
+TARGETS = nettle-benchmark$(EXEEXT) eratosthenes$(EXEEXT) \
+         base64enc$(EXEEXT) @IF_HOGWEED@ $(RSA_TARGETS) next-prime$(EXEEXT) random-prime$(EXEEXT)
 SOURCES = nettle-benchmark.c eratosthenes.c next-prime.c random-prime.c \
        nettle-openssl.c \
        io.c read_rsa_key.c \
-       rsa-encrypt.c rsa-decrypt.c rsa-keygen.c rsa-sign.c rsa-verify.c
+       rsa-encrypt.c rsa-decrypt.c rsa-keygen.c rsa-sign.c rsa-verify.c \
+       base64enc.c
+
 
 GETOPT_OBJS = ../getopt.$(OBJEXT) ../getopt1.$(OBJEXT)
 
@@ -41,31 +45,35 @@ next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
        $(LINK) next-prime.$(OBJEXT) $(GETOPT_OBJS) \
        -lhogweed -lnettle $(LIBS) -o next-prime$(EXEEXT)
 
-random-prime$(EXEEXT): random-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
+random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
        $(LINK) random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
        -lhogweed -lnettle $(LIBS) -o random-prime$(EXEEXT)
 
-rsa-keygen$(EXEEXT): rsa-keygen.$(OBJEXT) $(GETOPT_OBJS)
+rsa-keygen$(EXEEXT): rsa-keygen.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS)
        $(LINK) rsa-keygen.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
        -lhogweed -lnettle $(LIBS) -o rsa-keygen$(EXEEXT)
 
-rsa-sign$(EXEEXT): rsa-sign.$(OBJEXT) read_rsa_key.$(OBJEXT)
+rsa-sign$(EXEEXT): rsa-sign.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT)
        $(LINK) rsa-sign.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT) \
        -lhogweed -lnettle $(LIBS) -o rsa-sign$(EXEEXT)
 
-rsa-verify$(EXEEXT): rsa-verify.$(OBJEXT) read_rsa_key.$(OBJEXT)
+rsa-verify$(EXEEXT): rsa-verify.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT)
        $(LINK) rsa-verify.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT) \
        -lhogweed -lnettle $(LIBS) -o rsa-verify$(EXEEXT)
 
-rsa-encrypt$(EXEEXT): rsa-encrypt.$(OBJEXT) read_rsa_key.$(OBJEXT) $(GETOPT_OBJS)
+rsa-encrypt$(EXEEXT): rsa-encrypt.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT) $(GETOPT_OBJS)
        $(LINK) rsa-encrypt.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT) \
        $(GETOPT_OBJS) \
        -lhogweed -lnettle $(LIBS) -o rsa-encrypt$(EXEEXT)
 
-rsa-decrypt$(EXEEXT): rsa-decrypt.$(OBJEXT) read_rsa_key.$(OBJEXT)
+rsa-decrypt$(EXEEXT): rsa-decrypt.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT)
        $(LINK) rsa-decrypt.$(OBJEXT) io.$(OBJEXT) read_rsa_key.$(OBJEXT) \
        -lhogweed -lnettle $(LIBS) -o rsa-decrypt$(EXEEXT)
 
+base64enc$(EXEEXT): base64enc.$(OBJEXT) io.$(OBJEXT)
+       $(LINK) base64enc.$(OBJEXT) io.$(OBJEXT) \
+       -lnettle $(LIBS) -o base64enc$(EXEEXT)
+
 eratosthenes$(EXEEXT): eratosthenes.$(OBJEXT) $(GETOPT_OBJS)
        $(LINK) eratosthenes.$(OBJEXT) $(GETOPT_OBJS) -o eratosthenes$(EXEEXT)
 

diff --git a/examples/base64enc.c b/examples/base64enc.c
new file mode 100644 (file)
index 0000000..ecc9330
--- /dev/null
+++ b/examples/base64enc.c
@@ -0,0 +1,95 @@
+/* base64enc -- an encoder for base64
+ *
+ * Copyright (C) 2006, 2012 Jeronimo Pellegrini, Niels Möller
+ *  
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <nettle/base64.h>
+
+#include "io.h"
+
+/* The number of bytes read in each iteration, we do one line at a time: */
+#define CHUNK_SIZE 54
+
+/* The *maximum* size of an encoded chunk: */
+#define ENCODED_SIZE BASE64_ENCODE_LENGTH(CHUNK_SIZE)
+
+/*
+ * Reads bytes from standard input and writes base64-encoded
+ * on standard output.
+ */
+int main(int argc UNUSED, char **argv UNUSED)
+{
+  struct base64_encode_ctx b64_ctx;
+  
+  /* Init the context: */
+  base64_encode_init(&b64_ctx);
+
+#ifdef WIN32
+  _setmode(0, O_BINARY);
+#endif
+  
+  for (;;)
+    {
+      /* "buffer" will hold the bytes from disk: */
+      uint8_t buffer[CHUNK_SIZE];
+      /* "result" is the result vector: */
+      uint8_t result[ENCODED_SIZE + BASE64_ENCODE_FINAL_LENGTH + 1];
+      unsigned nbytes; /* Number of bytes read from stdin */
+      int encoded_bytes; /* total number of bytes encoded per iteration */
+      nbytes = fread(buffer,1,CHUNK_SIZE,stdin);
+
+      /* We overwrite result with more data */
+      encoded_bytes = base64_encode_update(&b64_ctx, result, nbytes, buffer);
+
+      if (nbytes < CHUNK_SIZE)
+       {
+         if (ferror(stdin))
+           {
+             werror ("Error reading file: %s\n", strerror(errno));
+             return EXIT_FAILURE;
+           }
+         encoded_bytes += base64_encode_final(&b64_ctx,result + encoded_bytes);
+
+         result[encoded_bytes++] = '\n';
+         if (!write_string (stdout, encoded_bytes, result)
+             || fflush (stdout) != 0)
+           {
+             werror ("Error writing file: %s\n", strerror(errno));
+             return EXIT_FAILURE;
+           }
+         return EXIT_SUCCESS;
+       }
+
+      /* The result vector is written */
+      result[encoded_bytes++] = '\n';
+      if (!write_string (stdout, encoded_bytes, result))
+       {
+         werror ("Error writing file: %s\n", strerror(errno));
+         return EXIT_FAILURE;
+       }
+    }
+}