X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=crypto%2Fobjects%2Fobj_dat.c;h=06a3fb3406161d8226f32fdf2220000426349b61;hb=cef115ff0ca4255d3decc1dda87c5418a961fd2c;hp=3f65d37bc689c0a29a35a5b0bc32878a3630a401;hpb=5f21b440681db5aecf29fbd930d1d8c912fc99b4;p=thirdparty%2Fopenssl.git diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 3f65d37bc6..06a3fb3406 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -632,6 +632,10 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num, return p; } +/* + * Parse a BIO sink to create some extra oid's objects. + * Line format: + */ int OBJ_create_objects(BIO *in) { char buf[512]; @@ -653,9 +657,9 @@ int OBJ_create_objects(BIO *in) *(s++) = '\0'; while (ossl_isspace(*s)) s++; - if (*s == '\0') + if (*s == '\0') { s = NULL; - else { + } else { l = s; while (*l != '\0' && !ossl_isspace(*l)) l++; @@ -663,14 +667,17 @@ int OBJ_create_objects(BIO *in) *(l++) = '\0'; while (ossl_isspace(*l)) l++; - if (*l == '\0') + if (*l == '\0') { l = NULL; - } else + } + } else { l = NULL; + } } - } else + } else { s = NULL; - if ((o == NULL) || (*o == '\0')) + } + if (*o == '\0') return num; if (!OBJ_create(o, s, l)) return num;