Merge main trunk to engine branch, all conflicts resolved.

2000-09-07 10:59:04 +00:00
parent 7dfded5c26
commit 192295a094
139 changed files with 8190 additions and 5733 deletions
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -134,7 +134,8 @@ static unsigned long add_hash(ADDED_OBJ *ca)
 		ret=a->nid;
 		break;
 	default:
-		abort();
+		/* abort(); */
+		return 0;
 		}
 	ret&=0x3fffffffL;
 	ret|=ca->type<<30L;
@@ -167,7 +168,8 @@ static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb)
 	case ADDED_NID:
 		return(a->nid-b->nid);
 	default:
-		abort();
+		/* abort(); */
+		return 0;
 		}
 	return(1); /* should not get here */
 	}