diff options
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index a2de78b545..2f4012fe15 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_dat.c,v 1.93 2025/02/26 09:52:55 tb Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.94 2025/02/26 10:48:25 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -119,7 +119,7 @@ added_obj_hash(const ADDED_OBJ *ca) | |||
| 119 | } | 119 | } |
| 120 | ret &= 0x3fffffffL; | 120 | ret &= 0x3fffffffL; |
| 121 | ret |= (unsigned long)ca->type << 30L; | 121 | ret |= (unsigned long)ca->type << 30L; |
| 122 | return (ret); | 122 | return ret; |
| 123 | } | 123 | } |
| 124 | static IMPLEMENT_LHASH_HASH_FN(added_obj, ADDED_OBJ) | 124 | static IMPLEMENT_LHASH_HASH_FN(added_obj, ADDED_OBJ) |
| 125 | 125 | ||
| @@ -205,7 +205,7 @@ OBJ_new_nid(int num) | |||
| 205 | 205 | ||
| 206 | i = new_nid; | 206 | i = new_nid; |
| 207 | new_nid += num; | 207 | new_nid += num; |
| 208 | return (i); | 208 | return i; |
| 209 | } | 209 | } |
| 210 | LCRYPTO_ALIAS(OBJ_new_nid); | 210 | LCRYPTO_ALIAS(OBJ_new_nid); |
| 211 | 211 | ||
| @@ -249,7 +249,7 @@ OBJ_add_object(const ASN1_OBJECT *obj) | |||
| 249 | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | | 249 | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | |
| 250 | ASN1_OBJECT_FLAG_DYNAMIC_DATA); | 250 | ASN1_OBJECT_FLAG_DYNAMIC_DATA); |
| 251 | 251 | ||
| 252 | return (o->nid); | 252 | return o->nid; |
| 253 | 253 | ||
| 254 | err2: | 254 | err2: |
| 255 | OBJerror(ERR_R_MALLOC_FAILURE); | 255 | OBJerror(ERR_R_MALLOC_FAILURE); |
| @@ -257,7 +257,7 @@ OBJ_add_object(const ASN1_OBJECT *obj) | |||
| 257 | for (i = ADDED_DATA; i <= ADDED_NID; i++) | 257 | for (i = ADDED_DATA; i <= ADDED_NID; i++) |
| 258 | free(ao[i]); | 258 | free(ao[i]); |
| 259 | ASN1_OBJECT_free(o); | 259 | ASN1_OBJECT_free(o); |
| 260 | return (NID_undef); | 260 | return NID_undef; |
| 261 | } | 261 | } |
| 262 | 262 | ||
| 263 | ASN1_OBJECT * | 263 | ASN1_OBJECT * |
| @@ -488,10 +488,10 @@ OBJ_create_objects(BIO *in) | |||
| 488 | s = o = NULL; | 488 | s = o = NULL; |
| 489 | i = BIO_gets(in, buf, 512); | 489 | i = BIO_gets(in, buf, 512); |
| 490 | if (i <= 0) | 490 | if (i <= 0) |
| 491 | return (num); | 491 | return num; |
| 492 | buf[i - 1] = '\0'; | 492 | buf[i - 1] = '\0'; |
| 493 | if (!isalnum((unsigned char)buf[0])) | 493 | if (!isalnum((unsigned char)buf[0])) |
| 494 | return (num); | 494 | return num; |
| 495 | o = s=buf; | 495 | o = s=buf; |
| 496 | while (isdigit((unsigned char)*s) || (*s == '.')) | 496 | while (isdigit((unsigned char)*s) || (*s == '.')) |
| 497 | s++; | 497 | s++; |
| @@ -518,9 +518,9 @@ OBJ_create_objects(BIO *in) | |||
| 518 | } else | 518 | } else |
| 519 | s = NULL; | 519 | s = NULL; |
| 520 | if ((o == NULL) || (*o == '\0')) | 520 | if ((o == NULL) || (*o == '\0')) |
| 521 | return (num); | 521 | return num; |
| 522 | if (!OBJ_create(o, s, l)) | 522 | if (!OBJ_create(o, s, l)) |
| 523 | return (num); | 523 | return num; |
| 524 | num++; | 524 | num++; |
| 525 | } | 525 | } |
| 526 | /* return(num); */ | 526 | /* return(num); */ |