pkcs15-crypt: Allow the use of stdin if no input file is specified.
This commit is contained in:
parent
a0c0087446
commit
92e02b50dc
|
@ -157,13 +157,19 @@ static int read_input(u8 *buf, int buflen)
|
||||||
FILE *inf;
|
FILE *inf;
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
inf = fopen(opt_input, "rb");
|
if (opt_input==NULL) {
|
||||||
if (inf == NULL) {
|
inf = stdin;
|
||||||
fprintf(stderr, "Unable to open '%s' for reading.\n", opt_input);
|
} else {
|
||||||
return -1;
|
inf = fopen(opt_input, "rb");
|
||||||
|
if (inf == NULL) {
|
||||||
|
fprintf(stderr, "Unable to open '%s' for reading.\n", opt_input);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
c = fread(buf, 1, buflen, inf);
|
c = fread(buf, 1, buflen, inf);
|
||||||
fclose(inf);
|
if (inf!=stdin) {
|
||||||
|
fclose(inf);
|
||||||
|
}
|
||||||
if (c < 0) {
|
if (c < 0) {
|
||||||
perror("read");
|
perror("read");
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -203,8 +209,7 @@ static int sign(struct sc_pkcs15_object *obj)
|
||||||
int r, c, len;
|
int r, c, len;
|
||||||
|
|
||||||
if (opt_input == NULL) {
|
if (opt_input == NULL) {
|
||||||
fprintf(stderr, "No input file specified.\n");
|
fprintf(stderr, "No input file specified. Reading from stdin\n");
|
||||||
return 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
c = read_input(buf, sizeof(buf));
|
c = read_input(buf, sizeof(buf));
|
||||||
|
@ -258,8 +263,7 @@ static int decipher(struct sc_pkcs15_object *obj)
|
||||||
int r, c, len;
|
int r, c, len;
|
||||||
|
|
||||||
if (opt_input == NULL) {
|
if (opt_input == NULL) {
|
||||||
fprintf(stderr, "No input file specified.\n");
|
fprintf(stderr, "No input file specified. Reading from stdin\n");
|
||||||
return 2;
|
|
||||||
}
|
}
|
||||||
c = read_input(buf, sizeof(buf));
|
c = read_input(buf, sizeof(buf));
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
|
|
Loading…
Reference in New Issue