projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix on platforms with missing pthread_rwlock_t.
[oweals/openssl.git]
/
crypto
/
objects
/
obj_dat.c
diff --git
a/crypto/objects/obj_dat.c
b/crypto/objects/obj_dat.c
index 3b836fe6a5d84b15ab6ff1cfc0364063c8f0f7f3..259851bc00960a86b3201da8d1c7504e36ace5ff 100644
(file)
--- a/
crypto/objects/obj_dat.c
+++ b/
crypto/objects/obj_dat.c
@@
-68,10
+68,10
@@
static unsigned long added_obj_hash(const ADDED_OBJ *ca)
ret ^= p[i] << ((i * 3) % 24);
break;
case ADDED_SNAME:
ret ^= p[i] << ((i * 3) % 24);
break;
case ADDED_SNAME:
- ret =
lh
_strhash(a->sn);
+ ret =
OPENSSL_LH
_strhash(a->sn);
break;
case ADDED_LNAME:
break;
case ADDED_LNAME:
- ret =
lh
_strhash(a->ln);
+ ret =
OPENSSL_LH
_strhash(a->ln);
break;
case ADDED_NID:
ret = a->nid;
break;
case ADDED_NID:
ret = a->nid;
@@
-199,7
+199,7
@@
int OBJ_add_object(const ASN1_OBJECT *obj)
ao[i]->type = i;
ao[i]->obj = o;
aop = lh_ADDED_OBJ_insert(added, ao[i]);
ao[i]->type = i;
ao[i]->obj = o;
aop = lh_ADDED_OBJ_insert(added, ao[i]);
- /* memory leak, bu
i
t should not normally matter */
+ /* memory leak, but should not normally matter */
OPENSSL_free(aop);
}
}
OPENSSL_free(aop);
}
}
@@
-373,6
+373,8
@@
ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
}
/* Work out total size */
j = ASN1_object_size(0, i, V_ASN1_OBJECT);
}
/* Work out total size */
j = ASN1_object_size(0, i, V_ASN1_OBJECT);
+ if (j < 0)
+ return NULL;
if ((buf = OPENSSL_malloc(j)) == NULL)
return NULL;
if ((buf = OPENSSL_malloc(j)) == NULL)
return NULL;