read the signature
CVS patchset: 385 CVS date: 1996/02/21 22:20:51
This commit is contained in:
parent
d90c22d3e9
commit
177488cb3b
|
@ -10,6 +10,7 @@
|
||||||
#include "rpmerr.h"
|
#include "rpmerr.h"
|
||||||
#include "rpmlead.h"
|
#include "rpmlead.h"
|
||||||
#include "rpmlib.h"
|
#include "rpmlib.h"
|
||||||
|
#include "signature.h"
|
||||||
|
|
||||||
/* 0 = success */
|
/* 0 = success */
|
||||||
/* !0 = error */
|
/* !0 = error */
|
||||||
|
@ -39,6 +40,9 @@ int pkgReadHeader(int fd, Header * hdr, int * isSource) {
|
||||||
oldLead->archiveOffset = ntohl(oldLead->archiveOffset);
|
oldLead->archiveOffset = ntohl(oldLead->archiveOffset);
|
||||||
lseek(fd, oldLead->archiveOffset, SEEK_SET);
|
lseek(fd, oldLead->archiveOffset, SEEK_SET);
|
||||||
} else {
|
} else {
|
||||||
|
if (!readSignature(fd, lead.signature_type, NULL)) {
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
*hdr = readHeader(fd);
|
*hdr = readHeader(fd);
|
||||||
if (! *hdr) return 2;
|
if (! *hdr) return 2;
|
||||||
freeHeader(*hdr);
|
freeHeader(*hdr);
|
||||||
|
@ -47,6 +51,9 @@ int pkgReadHeader(int fd, Header * hdr, int * isSource) {
|
||||||
if (lead.major == 1) {
|
if (lead.major == 1) {
|
||||||
readOldHeader(fd, hdr, isSource);
|
readOldHeader(fd, hdr, isSource);
|
||||||
} else if (lead.major == 2) {
|
} else if (lead.major == 2) {
|
||||||
|
if (!readSignature(fd, lead.signature_type, NULL)) {
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
*hdr = readHeader(fd);
|
*hdr = readHeader(fd);
|
||||||
if (! *hdr) return 2;
|
if (! *hdr) return 2;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue