summaryrefslogtreecommitdiffstats
path: root/src/include/ipxe
diff options
context:
space:
mode:
authorMichael Brown2010-05-28 13:42:00 +0200
committerMichael Brown2010-05-28 13:47:10 +0200
commit97ea628484be522734d074995555ffcf3884a0e0 (patch)
tree225cc6a8867c5ea20bcfbf6ee6d1af008e7b66f4 /src/include/ipxe
parent[base64] Allow base64_encode() to handle arbitrary data (diff)
downloadipxe-97ea628484be522734d074995555ffcf3884a0e0.tar.gz
ipxe-97ea628484be522734d074995555ffcf3884a0e0.tar.xz
ipxe-97ea628484be522734d074995555ffcf3884a0e0.zip
[base64] Add ability to decode base64 strings
Inspired-by: Piotr JaroszyƄski <p.jaroszynski@gmail.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include/ipxe')
-rw-r--r--src/include/ipxe/base64.h15
-rw-r--r--src/include/ipxe/errfile.h1
2 files changed, 16 insertions, 0 deletions
diff --git a/src/include/ipxe/base64.h b/src/include/ipxe/base64.h
index 88c91563..5fe134dc 100644
--- a/src/include/ipxe/base64.h
+++ b/src/include/ipxe/base64.h
@@ -10,6 +10,7 @@
FILE_LICENCE ( GPL2_OR_LATER );
#include <stdint.h>
+#include <string.h>
/**
* Calculate length of base64-encoded data
@@ -21,6 +22,20 @@ static inline size_t base64_encoded_len ( size_t raw_len ) {
return ( ( ( raw_len + 3 - 1 ) / 3 ) * 4 );
}
+/**
+ * Calculate maximum length of base64-decoded string
+ *
+ * @v encoded Encoded string
+ * @v max_raw_len Maximum length of raw data
+ *
+ * Note that the exact length of the raw data cannot be known until
+ * the string is decoded.
+ */
+static inline size_t base64_decoded_max_len ( const char *encoded ) {
+ return ( ( ( strlen ( encoded ) + 4 - 1 ) / 4 ) * 3 );
+}
+
extern void base64_encode ( const uint8_t *raw, size_t len, char *encoded );
+extern int base64_decode ( const char *encoded, uint8_t *raw );
#endif /* _IPXE_BASE64_H */
diff --git a/src/include/ipxe/errfile.h b/src/include/ipxe/errfile.h
index 28648136..c62a5b7d 100644
--- a/src/include/ipxe/errfile.h
+++ b/src/include/ipxe/errfile.h
@@ -53,6 +53,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define ERRFILE_vsprintf ( ERRFILE_CORE | 0x000d0000 )
#define ERRFILE_xfer ( ERRFILE_CORE | 0x000e0000 )
#define ERRFILE_bitmap ( ERRFILE_CORE | 0x000f0000 )
+#define ERRFILE_base64 ( ERRFILE_CORE | 0x00100000 )
#define ERRFILE_eisa ( ERRFILE_DRIVER | 0x00000000 )
#define ERRFILE_isa ( ERRFILE_DRIVER | 0x00010000 )