[Git][NTPsec/ntpsec][master] Pull includes

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
56d97da5 by James Browning at 2020-08-06T23:38:30+00:00
Pull includes

- - - - -


4 changed files:

- libaes_siv/README.md
- libjsmn/README.md
- libjsmn/jsmn.h
- libjsmn/test/testutil.h


Changes:

=====================================
libaes_siv/README.md
=====================================
@@ -135,7 +135,7 @@ In December 2018, OpenSSL merged an AES-SIV implementation derived
 from libaes_siv. As of February 2019 this implementation has not been
 released yet; it will appear some time post-1.1.1. However, despite
 the two implementations' common ancestry, they are not API-compatible.
-The OpenSSL team had to make an ugly-but-necessary compromise into order
+The OpenSSL team had to make an ugly-but-necessary compromise in order
 to shoehorn SIV mode into OpenSSL's EVP API, which is a streaming API
 that was never designed to support SIV's two-pass operation. When used for
 SIV operations, the EVP API is forced to return an error if you invoke


=====================================
libjsmn/README.md
=====================================
@@ -158,7 +158,7 @@ the `js` string.
 A non-negative return value of `jsmn_parse` is the number of tokens actually
 used by the parser.
 Passing NULL instead of the tokens array would not store parsing results, but
-instead the function will return the value of tokens needed to parse the given
+instead the function will return the number of tokens needed to parse the given
 string. This can be useful if you don't know yet how many tokens to allocate.
 
 If something goes wrong, you will get an error. Error will be one of these:


=====================================
libjsmn/jsmn.h
=====================================
@@ -47,7 +47,7 @@ enum jsmnerr {
  * start	start position in JSON data string
  * end		end position in JSON data string
  */
-typedef struct {
+typedef struct jsmntok {
   jsmntype_t type;
   int start;
   int end;
@@ -61,7 +61,7 @@ typedef struct {
  * JSON parser. Contains an array of token blocks available. Also stores
  * the string being parsed now and current position in that string.
  */
-typedef struct {
+typedef struct jsmn_parser {
   unsigned int pos;     /* offset in the JSON string */
   unsigned int toknext; /* next token to allocate */
   int toksuper;         /* superior token node, e.g. parent object or array */


=====================================
libjsmn/test/testutil.h
=====================================
@@ -8,13 +8,13 @@ static int vtokeq(const char *s, jsmntok_t *t, unsigned long numtok,
   if (numtok > 0) {
     unsigned long i;
     int start, end, size;
-    int type;
+    jsmntype_t type;
     char *value;
 
     size = -1;
     value = NULL;
     for (i = 0; i < numtok; i++) {
-      type = va_arg(ap, int);
+      type = va_arg(ap, jsmntype_t);
       if (type == JSMN_STRING) {
         value = va_arg(ap, char *);
         size = va_arg(ap, int);
@@ -61,7 +61,7 @@ static int vtokeq(const char *s, jsmntok_t *t, unsigned long numtok,
   return 1;
 }
 
-static int tokeq(const char *s, jsmntok_t *tokens, int numtok, ...) {
+static int tokeq(const char *s, jsmntok_t *tokens, unsigned long numtok, ...) {
   int ok;
   va_list args;
   va_start(args, numtok);
@@ -70,7 +70,7 @@ static int tokeq(const char *s, jsmntok_t *tokens, int numtok, ...) {
   return ok;
 }
 
-static int parse(const char *s, int status, int numtok, ...) {
+static int parse(const char *s, int status, unsigned long numtok, ...) {
   int r;
   int ok = 1;
   va_list args;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/56d97da544ca848e9290a781206f807dce8c62b3

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/56d97da544ca848e9290a781206f807dce8c62b3
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20200809/3275c94b/attachment-0001.htm>