jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

index: remove support of old index format 

It's no longer needed or used.
cute-signatures
Timo Teräs 2011-01-01 12:17:06 +02:00
parent b01d144c69
commit 0cc41ba4dc
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_package.h
View File

@ -32,7 +32,6 @@ struct apk_name;
#define APK_SIGN_NONE 0 #define APK_SIGN_NONE 0
#define APK_SIGN_VERIFY 1 #define APK_SIGN_VERIFY 1
#define APK_SIGN_VERIFY_IDENTITY 2 #define APK_SIGN_VERIFY_IDENTITY 2
#define APK_SIGN_GENERATE_V1 3
#define APK_SIGN_GENERATE 4 #define APK_SIGN_GENERATE 4
#define APK_SIGN_VERIFY_AND_GENERATE 5 #define APK_SIGN_VERIFY_AND_GENERATE 5

7
src/index.c
View File

@ -17,8 +17,6 @@
#include "apk_database.h" #include "apk_database.h"
#include "apk_print.h" #include "apk_print.h"
#define INDEX_OLD_FORMAT 0x10000
struct counts { struct counts {
int unsatisfied; int unsatisfied;
}; };
@ -46,9 +44,6 @@ static int index_parse(void *ctx, struct apk_db_options *dbopts,
case 'd': case 'd':
ictx->description = optarg; ictx->description = optarg;
break; break;
case INDEX_OLD_FORMAT:
ictx->method = APK_SIGN_GENERATE_V1;
break;
default: default:
return -1; return -1;
} }
@ -219,8 +214,6 @@ static struct apk_option index_options[] = {
{ 'd', "description", "Embed TEXT as description and version " { 'd', "description", "Embed TEXT as description and version "
"information of the repository index", "information of the repository index",
required_argument, "TEXT" }, required_argument, "TEXT" },
{ INDEX_OLD_FORMAT, "old-format",
"Specify to create old style index files" }
}; };
static struct apk_applet apk_index = { static struct apk_applet apk_index = {

6
src/package.c
View File

@ -367,11 +367,6 @@ void apk_sign_ctx_init(struct apk_sign_ctx *ctx, int action,
} }
memcpy(&ctx->identity, identity, sizeof(ctx->identity)); memcpy(&ctx->identity, identity, sizeof(ctx->identity));
break; break;
case APK_SIGN_GENERATE_V1:
ctx->md = EVP_md5();
ctx->control_started = 1;
ctx->data_started = 1;
break;
case APK_SIGN_GENERATE: case APK_SIGN_GENERATE:
case APK_SIGN_VERIFY_AND_GENERATE: case APK_SIGN_VERIFY_AND_GENERATE:
ctx->md = EVP_sha1(); ctx->md = EVP_sha1();
@ -574,7 +569,6 @@ int apk_sign_ctx_mpart_cb(void *ctx, int part, apk_blob_t data)
sctx->data_verified = 1; sctx->data_verified = 1;
break; break;
case APK_SIGN_GENERATE: case APK_SIGN_GENERATE:
case APK_SIGN_GENERATE_V1:
/* Package identity is the checksum */ /* Package identity is the checksum */
sctx->identity.type = EVP_MD_CTX_size(&sctx->mdctx); sctx->identity.type = EVP_MD_CTX_size(&sctx->mdctx);
EVP_DigestFinal_ex(&sctx->mdctx, sctx->identity.data, NULL); EVP_DigestFinal_ex(&sctx->mdctx, sctx->identity.data, NULL);