projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an incoherent test.
[openssl.git]
/
crypto
/
objects
/
obj_dat.c
diff --git
a/crypto/objects/obj_dat.c
b/crypto/objects/obj_dat.c
index 3f65d37bc689c0a29a35a5b0bc32878a3630a401..06a3fb3406161d8226f32fdf2220000426349b61 100644
(file)
--- 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;
}
return p;
}
+/*
+ * Parse a BIO sink to create some extra oid's objects.
+ * Line format:<OID:isdigit or '.']><isspace><SN><isspace><LN>
+ */
int OBJ_create_objects(BIO *in)
{
char buf[512];
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++;
*(s++) = '\0';
while (ossl_isspace(*s))
s++;
- if (*s == '\0')
+ if (*s == '\0')
{
s = NULL;
s = NULL;
- else {
+
}
else {
l = s;
while (*l != '\0' && !ossl_isspace(*l))
l++;
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++;
*(l++) = '\0';
while (ossl_isspace(*l))
l++;
- if (*l == '\0')
+ if (*l == '\0')
{
l = NULL;
l = NULL;
- } else
+ }
+ } else {
l = NULL;
l = NULL;
+ }
}
}
- } else
+ } else
{
s = NULL;
s = NULL;
- if ((o == NULL) || (*o == '\0'))
+ }
+ if (*o == '\0')
return num;
if (!OBJ_create(o, s, l))
return num;
return num;
if (!OBJ_create(o, s, l))
return num;