d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close descriptor in retrieve_x509_marker function.

Browse Source 
PR:		bin/71594
Submitted by:	Dan Lukes <dan@obluda.cz>
This commit is contained in:
krion 2006-03-15 01:19:23 +00:00
parent 8e7c134331
commit 3cfe57f112
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/pkg_install/sign/sign.c
View File

@ -116,6 +116,9 @@ sign(filename, type, userid, envp)
case TAG_X509:
success = retrieve_x509_marker(filename, &sign, userid);
break;
default:
success = 0;
fprintf(stderr, "Unknown type %d\n", type);
}
if (!success) {

23
usr.sbin/pkg_install/sign/x509.c
View File

@ -152,7 +152,8 @@ new_x509_checker(h, sign, userid, envp, filename)
break;
default:
warnx("Uknown certificate type");
warnx("Unknown certificate type: %d", EVP_PKEY_type(X509_get_pubkey(x509)->type));
fclose(fp);
return 0;
}
@ -234,13 +235,15 @@ x509_sign_ok(arg)
break;
default:
warnx("Unknown public key type: %d", EVP_PKEY_type(pkey->type));
md_ctx = NULL;
break;
}
status = EVP_VerifyFinal(md_ctx,
n->signature->data,
n->signature->length,
pkey);
status = (md_ctx == NULL) ? 0 : EVP_VerifyFinal(md_ctx,
n->signature->data,
n->signature->length,
pkey);
EVP_PKEY_free(pkey);
X509_free(x509);
@ -291,13 +294,11 @@ retrieve_x509_marker(filename, sign, userid)
f = fopen(filename, "r");
if (f == NULL) {
free(n);
return 0;
}
if (gzip_read_header(f, &h, sign) == GZIP_NOT_GZIP) {
warnx("File %s is not a gzip file\n", filename);
fclose(f);
free(n);
return 0;
}
@ -314,6 +315,7 @@ retrieve_x509_marker(filename, sign, userid)
if (keyf == NULL)
{
warnx("Cannot open private key %s.", keyfile);
fclose(f);
return 0;
}
@ -335,16 +337,15 @@ retrieve_x509_marker(filename, sign, userid)
{
case EVP_PKEY_RSA:
md_type = EVP_sha1();
printf("*** It's an RSA key.\n");
break;
case EVP_PKEY_DSA:
md_type = EVP_dss1();
printf("@@@ It's a DSA key, yippee!\n");
break;
default:
warnx("Uknown key type");
warnx("Unknown key type");
fclose(f);
return 0;
}
@ -353,6 +354,8 @@ printf("@@@ It's a DSA key, yippee!\n");
while ((length = fread(buffer, 1, sizeof buffer, f)) > 0)
EVP_SignUpdate(&md_ctx, buffer, length);
fclose(f);
sig_buf = malloc(sig_len);
if (sig_buf == NULL) {
warnx("Cannot allocated %u bytes for signature buffer", sig_len);