return -1;
case 0:
- if (
-#ifdef UCERT_HOST_BUILD
- execvp(usign_argv[0], usign_argv)
-#else
- execv(usign_argv[0], usign_argv)
-#endif
- )
+ if (execvp(usign_argv[0], (char *const *)usign_argv))
return -1;
break;
close(fds[0]);
close(fds[1]);
- if (
-#ifdef UCERT_HOST_BUILD
- execvp(usign_argv[0], usign_argv)
-#else
- execv(usign_argv[0], usign_argv)
-#endif
- )
+ if (execvp(usign_argv[0], (char *const *)usign_argv))
return -1;
break;
waitpid(pid, &status, 0);
status = WEXITSTATUS(status);
if (fingerprint && !WEXITSTATUS(status)) {
+ ssize_t r;
memset(fingerprint, 0, 17);
- read(fds[0], fingerprint, 17);
- if (fingerprint[16] != '\n')
+ r = read(fds[0], fingerprint, 17);
+ if (r < 16)
status = -1;
fingerprint[16] = '\0';
if (usign_f_sig(fingerprint, sigfile)) {
if (!quiet)
- fprintf(stdout, "cannot get signing key fingerprint\n");
+ fprintf(stderr, "cannot get signing key fingerprint\n");
return 1;
}
if (pubkeydir && _usign_key_is_revoked(fingerprint, pubkeydir)) {
if (!quiet)
- fprintf(stdout, "key %s has been revoked!\n", fingerprint);
+ fprintf(stderr, "key %s has been revoked!\n", fingerprint);
return 1;
}
usign_argv[usign_argc++] = USIGN_EXEC;
return -1;
case 0:
- if (
-#ifdef UCERT_HOST_BUILD
- execvp(usign_argv[0], usign_argv)
-#else
- execv(usign_argv[0], usign_argv)
-#endif
- )
+ if (execvp(usign_argv[0], (char *const *)usign_argv))
return -1;
break;