diff --git a/base64-meta.c b/base64-meta.c
new file mode 100644
index 0000000000000000000000000000000000000000..89081baaa7e2339a46d9a3a3b5e5dc6302d09eb2
--- /dev/null
+++ b/base64-meta.c
@@ -0,0 +1,28 @@
+/* base64-meta.c */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2002 Niels Möller
+ *
+ * The nettle library 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.
+ *
+ * The nettle library 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.
+ */
+
+#include "nettle-meta.h"
+
+#include "base64.h"
+
+const struct nettle_armor nettle_base64
+= _NETTLE_ARMOR(base64, BASE64);
diff --git a/base64.c b/base64.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e6609e2637d0dd8b66131e1577ce372ee00ca86
--- /dev/null
+++ b/base64.c
@@ -0,0 +1,131 @@
+/* base64.c
+ *
+ * Base64 "ASCII armor" codec.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2002 Niels Möller, Dan Egnor
+ *
+ * The nettle library 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.
+ *
+ * The nettle library 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.
+ */
+
+#include "base64.h"
+
+#include <assert.h>
+
+#define TABLE_INVALID -1
+#define TABLE_SPACE -2
+#define TABLE_END -3
+
+static const uint8_t encode_table[64] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789+/";
+
+static const signed char decode_table[256] =
+{
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -1, -1, -2, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -3, -1, -1,
+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+unsigned
+base64_encode(uint8_t *dst,
+ unsigned src_length,
+ const uint8_t *src)
+{
+ uint8_t *out = dst;
+
+ while (src_length >= 3)
+ {
+ *out++ = encode_table[0x3F & (src[0] >> 2)];
+ *out++ = encode_table[0x3F & ((src[0] << 4) | (src[1] >> 4))];
+ *out++ = encode_table[0x3F & ((src[1] << 2) | (src[2] >> 6))];
+ *out++ = encode_table[0x3F & src[2]];
+ src += 3;
+ src_length -= 3;
+ }
+
+ switch (src_length)
+ {
+ case 2:
+ *out++ = encode_table[0x3F & (src[0] >> 2)];
+ *out++ = encode_table[0x3F & ((src[0] << 4) | (src[1] >> 4))];
+ *out++ = encode_table[0x3F & (src[1] << 2)];
+ *out++ = '=';
+ break;
+ case 1:
+ *out++ = encode_table[0x3F & (src[0] >> 2)];
+ *out++ = encode_table[0x3F & (src[0] << 4)];
+ *out++ = '=';
+ *out++ = '=';
+ break;
+ case 0:
+ break;
+ }
+
+ return out - dst;
+}
+
+unsigned
+base64_decode(uint8_t *dst,
+ unsigned src_length,
+ const uint8_t *src)
+{
+ uint8_t *out = dst;
+ uint32_t accum = 0;
+ int shift = 10;
+
+ while (src_length > 0)
+ {
+ const int data = decode_table[*src];
+ switch (data)
+ {
+ default:
+ accum |= data << shift;
+ shift -= 6;
+ if (shift <= 2)
+ {
+ *out++ = accum >> 8;
+ accum = accum << 8;
+ shift += 8;
+ }
+ case TABLE_INVALID:
+ case TABLE_SPACE:
+ case TABLE_END:
+ break;
+ }
+
+ ++src;
+ --src_length;
+ }
+
+ return out - dst;
+}
diff --git a/base64.h b/base64.h
new file mode 100644
index 0000000000000000000000000000000000000000..27888b853226c7d0cdbd684c83924ada8ab9f01b
--- /dev/null
+++ b/base64.h
@@ -0,0 +1,46 @@
+/* armor.h
+ *
+ * "ASCII armor" codecs.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2001 Niels Möller
+ *
+ * The nettle library 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.
+ *
+ * The nettle library 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.
+ */
+
+#ifndef NETTLE_ARMOR_H_INCLUDED
+#define NETTLE_ARMOR_H_INCLUDED
+
+#include <inttypes.h>
+
+/* Base64 encoding */
+
+#define BASE64_ASCII_BLOCK_SIZE 4
+#define BASE64_RAW_BLOCK_SIZE 3
+
+unsigned /* Returns the length of encoded data */
+base64_encode(uint8_t *dst,
+ unsigned src_length,
+ const uint8_t *src);
+
+unsigned /* Returns the length of decoded data */
+base64_decode(uint8_t *dst,
+ unsigned src_length,
+ const uint8_t *src);
+
+#endif /* NETTLE_ARMOR_H_INCLUDED */