Stuffer macros missed in error handler refactoring

- Commit 558b3fc switched from error param to return value, stuffer macros did not get updated in the mix
- Removes obsolete s2n_stuffer_init_text() macro (must init with s2n_blob thus macro too complex)
- Updates s2n_stuffer_write_str() to use s2n_stuffer_write_bytes()
- Updates s2n_stuffer_write_str() to remove unused n arg
- Updates s2n_stuffer_write_text() to use s2n_stuffer_write_bytes()
- Updates s2n_stuffer_read_text() to use s2n_stuffer_read_bytes()
- Corrects test code to match macros and methods (still disabled via
  preproc)

Author: sixlettervariables

stuffer/s2n_stuffer.h

@@ -96,12 +96,11 @@ extern int s2n_stuffer_read_base64(struct s2n_stuffer *stuffer, struct s2n_stuff
 extern int s2n_stuffer_write_base64(struct s2n_stuffer *stuffer, struct s2n_stuffer *in);
 
 /* Useful for text manipulation ... */
-#define s2n_stuffer_init_text( stuffer, text, len, err )  s2n_stuffer_init( (stuffer), (uint8_t *) (text), (len), (err) )
-#define s2n_stuffer_write_char( stuffer, c, err )  s2n_stuffer_write_uint8( (stuffer), (uint8_t) (c), (err) )
-#define s2n_stuffer_read_char( stuffer, c, err )  s2n_stuffer_read_uint8( (stuffer), (uint8_t *) (c), (err) )
-#define s2n_stuffer_write_str( stuffer, c, n, err )  s2n_stuffer_write( (stuffer), (const uint8_t *) (c), strlen((c)), (err) )
-#define s2n_stuffer_write_text( stuffer, c, n, err )  s2n_stuffer_write( (stuffer), (const uint8_t *) (c), (n), (err) )
-#define s2n_stuffer_read_text( stuffer, c, n, err )  s2n_stuffer_read( (stuffer), (uint8_t *) (c), (n), (err) )
+#define s2n_stuffer_write_char( stuffer, c )  s2n_stuffer_write_uint8( (stuffer), (uint8_t) (c) )
+#define s2n_stuffer_read_char( stuffer, c )  s2n_stuffer_read_uint8( (stuffer), (uint8_t *) (c) )
+#define s2n_stuffer_write_str( stuffer, c )  s2n_stuffer_write_bytes( (stuffer), (const uint8_t *) (c), strlen((c)) )
+#define s2n_stuffer_write_text( stuffer, c, n )  s2n_stuffer_write_bytes( (stuffer), (const uint8_t *) (c), (n) )
+#define s2n_stuffer_read_text( stuffer, c, n )  s2n_stuffer_read_bytes( (stuffer), (uint8_t *) (c), (n) )
 extern int s2n_stuffer_peek_char(struct s2n_stuffer *stuffer, char *c);
 extern int s2n_stuffer_read_token(struct s2n_stuffer *stuffer, struct s2n_stuffer *token, char delim);
 extern int s2n_stuffer_skip_whitespace(struct s2n_stuffer *stuffer);

tests/unit/s2n_stuffer_text_test.c

@@ -17,6 +17,7 @@
 #include <string.h>
 
 #include "stuffer/s2n_stuffer.h"
+#include "utils/s2n_blob.h"
 #include "utils/s2n_random.h"
 
 int main(int argc, char **argv)
@@ -29,12 +30,15 @@ int main(int argc, char **argv)
     char out[1024];
     char c;
     struct s2n_stuffer stuffer, token;
+    struct s2n_blob pblob, tblob;
 
     BEGIN_TEST();
 
     /* Create a stuffer */
-    EXPECT_SUCCESS(s2n_stuffer_init_text(&token, tokenpad, sizeof(tokenpad)));
-    EXPECT_SUCCESS(s2n_stuffer_init_text(&stuffer, pad, sizeof(pad)));
+    EXPECT_SUCCESS(s2n_blob_init(&tblob, (uint8_t *)tokenpad, sizeof(tokenpad)));
+    EXPECT_SUCCESS(s2n_stuffer_init(&token, &tblob));
+    EXPECT_SUCCESS(s2n_blob_init(&pblob, (uint8_t *)pad, sizeof(pad)));
+    EXPECT_SUCCESS(s2n_stuffer_init(&stuffer, &pblob));
     EXPECT_SUCCESS(s2n_stuffer_write_text(&stuffer, text, sizeof(text)));
 
     /* Skip 4 bytes of whitespace */
@@ -61,18 +65,18 @@ int main(int argc, char **argv)
     EXPECT_FAILURE(s2n_stuffer_read_char(&stuffer, &c));
 
     /* Start a new buffer */
-    EXPECT_SUCCESS(s2n_stuffer_init_text(&stuffer, pad, sizeof(pad)));
+    EXPECT_SUCCESS(s2n_stuffer_init(&stuffer, &pblob));
     EXPECT_SUCCESS(s2n_stuffer_write_text(&stuffer, fields, strlen(fields)));
 
     EXPECT_SUCCESS(s2n_stuffer_read_token(&stuffer, &token, ','));
     EXPECT_EQUAL(memcmp("one", token.blob.data, 3), 0);
 
-    EXPECT_SUCCESS(s2n_stuffer_init_text(&token, tokenpad, sizeof(tokenpad)));
+    EXPECT_SUCCESS(s2n_stuffer_init(&token, &tblob));
     EXPECT_SUCCESS(s2n_stuffer_read_token(&stuffer, &token, ','));
     EXPECT_EQUAL(memcmp("two", token.blob.data, 3), 0);
 
     /* Check for end-of-stream termination */
-    EXPECT_SUCCESS(s2n_stuffer_init_text(&token, tokenpad, sizeof(tokenpad)));
+    EXPECT_SUCCESS(s2n_stuffer_init(&token, &tblob));
     EXPECT_SUCCESS(s2n_stuffer_read_token(&stuffer, &token, ','));
     EXPECT_EQUAL(memcmp("three", token.blob.data, 5), 0);