diff options
| author | beck <> | 2002-06-07 03:45:34 +0000 |
|---|---|---|
| committer | beck <> | 2002-06-07 03:45:34 +0000 |
| commit | 820a20ea2b5f97e4a8fb714fedf33edafd40740a (patch) | |
| tree | 595b35cf9e1ff104d11fb8ab64ebb6a5c5f42755 /src/lib/libcrypto/objects/obj_dat.c | |
| parent | d13d58e31ac54f9b283fe3ec100f31030e050fb4 (diff) | |
| download | openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.gz openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.tar.bz2 openbsd-820a20ea2b5f97e4a8fb714fedf33edafd40740a.zip | |
Merge OpenSSL 0.9.7-stable-20020605,
correctly autogenerate obj_mac.h
Diffstat (limited to 'src/lib/libcrypto/objects/obj_dat.c')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index 8779ba7d1d..3ff64bb8d1 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -236,7 +236,7 @@ int OBJ_add_object(const ASN1_OBJECT *obj) | |||
| 236 | if (added == NULL) | 236 | if (added == NULL) |
| 237 | if (!init_added()) return(0); | 237 | if (!init_added()) return(0); |
| 238 | if ((o=OBJ_dup(obj)) == NULL) goto err; | 238 | if ((o=OBJ_dup(obj)) == NULL) goto err; |
| 239 | ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); | 239 | if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err; |
| 240 | if ((o->length != 0) && (obj->data != NULL)) | 240 | if ((o->length != 0) && (obj->data != NULL)) |
| 241 | ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); | 241 | ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)); |
| 242 | if (o->sn != NULL) | 242 | if (o->sn != NULL) |