diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-01-01 12:17:06 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-01-01 12:17:06 +0200 |
| commit | 0cc41ba4dc47561f8a2299b985be777c2befdb74 (patch) | |
| tree | 706c3d655c2068179fd9e78540e8b129369b2316 | |
| parent | b01d144c6922384921f808b190430ad7aa114010 (diff) | |
| download | aports-0cc41ba4dc47561f8a2299b985be777c2befdb74.tar.bz2 aports-0cc41ba4dc47561f8a2299b985be777c2befdb74.tar.xz | |
index: remove support of old index format
It's no longer needed or used.
| -rw-r--r-- | src/apk_package.h | 1 | ||||
| -rw-r--r-- | src/index.c | 7 | ||||
| -rw-r--r-- | src/package.c | 6 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/apk_package.h b/src/apk_package.h index 0b0d317df9..65d20ad4a7 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -32,7 +32,6 @@ struct apk_name; #define APK_SIGN_NONE 0 #define APK_SIGN_VERIFY 1 #define APK_SIGN_VERIFY_IDENTITY 2 -#define APK_SIGN_GENERATE_V1 3 #define APK_SIGN_GENERATE 4 #define APK_SIGN_VERIFY_AND_GENERATE 5 diff --git a/src/index.c b/src/index.c index a6f9cc4f61..d2b4b01824 100644 --- a/src/index.c +++ b/src/index.c @@ -17,8 +17,6 @@ #include "apk_database.h" #include "apk_print.h" -#define INDEX_OLD_FORMAT 0x10000 - struct counts { int unsatisfied; }; @@ -46,9 +44,6 @@ static int index_parse(void *ctx, struct apk_db_options *dbopts, case 'd': ictx->description = optarg; break; - case INDEX_OLD_FORMAT: - ictx->method = APK_SIGN_GENERATE_V1; - break; default: return -1; } @@ -219,8 +214,6 @@ static struct apk_option index_options[] = { { 'd', "description", "Embed TEXT as description and version " "information of the repository index", required_argument, "TEXT" }, - { INDEX_OLD_FORMAT, "old-format", - "Specify to create old style index files" } }; static struct apk_applet apk_index = { diff --git a/src/package.c b/src/package.c index db10802932..d79fc4a824 100644 --- a/src/package.c +++ b/src/package.c @@ -367,11 +367,6 @@ void apk_sign_ctx_init(struct apk_sign_ctx *ctx, int action, } memcpy(&ctx->identity, identity, sizeof(ctx->identity)); 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_VERIFY_AND_GENERATE: 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; break; case APK_SIGN_GENERATE: - case APK_SIGN_GENERATE_V1: /* Package identity is the checksum */ sctx->identity.type = EVP_MD_CTX_size(&sctx->mdctx); EVP_DigestFinal_ex(&sctx->mdctx, sctx->identity.data, NULL); |