Simplify KEY_Set().

src/keys.c

@@ -448,24 +448,18 @@ KEY_Set(VRT_CTX, uint8_t *id, uint8_t idlen, const uint8_t *key)
 	k = key_find(tree_h, id, idlen);
 	if (k == NULL) {
 		k = key_insert(ctx, id, idlen, key, tree_h);
-		KEY_Unlock(idlen);
-		if (k != NULL) {
-			CHECK_OBJ(k, KEY_MAGIC);
-			AN(k->key);
-			AN(k->id);
-			AZ(memcmp(k->key, key, AES128_KEYLEN));
-			assert(k->idlen == idlen);
-			AZ(memcmp(k->id, id, idlen));
-			return (0);
-		}
-		else
+		if (k == NULL) {
+			KEY_Unlock(idlen);
 			return (-1);
+		}
 	}
 	CHECK_OBJ(k, KEY_MAGIC);
 	AN(k->key);
+	AZ(memcmp(k->key, key, AES128_KEYLEN));
 	memcpy(k->key, key, AES128_KEYLEN);
 	KEY_Unlock(idlen);
 
+	AN(k->id);
 	assert(k->idlen == idlen);
 	AZ(memcmp(k->id, id, idlen));
 	return (0);