diff --git a/tools/certgen.c b/tools/certgen.c index 4969b3e6..8e119ed2 100644 --- a/tools/certgen.c +++ b/tools/certgen.c @@ -115,7 +115,7 @@ int certgen_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -125,7 +125,7 @@ int certgen_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/certparse.c b/tools/certparse.c index 4a925e3a..147ac5ef 100644 --- a/tools/certparse.c +++ b/tools/certparse.c @@ -39,14 +39,14 @@ int certparse_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/certverify.c b/tools/certverify.c index 64eba1f5..ae72e563 100644 --- a/tools/certverify.c +++ b/tools/certverify.c @@ -55,7 +55,7 @@ int certverify_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } @@ -64,7 +64,7 @@ int certverify_main(int argc, char **argv) } else if (!strcmp(*argv, "-cacert")) { if (--argc < 1) goto bad; cacertfile = *(++argv); - if (!(cacertfp = fopen(cacertfile, "r"))) { + if (!(cacertfp = fopen(cacertfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, cacertfile, strerror(errno)); goto end; } diff --git a/tools/cmsdecrypt.c b/tools/cmsdecrypt.c index 2b676f60..e9452113 100644 --- a/tools/cmsdecrypt.c +++ b/tools/cmsdecrypt.c @@ -64,7 +64,7 @@ int cmsdecrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -74,21 +74,21 @@ int cmsdecrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-cert")) { if (--argc < 1) goto bad; certfile = *(++argv); - if (!(certfp = fopen(certfile, "r"))) { + if (!(certfp = fopen(certfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, certfile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/cmsencrypt.c b/tools/cmsencrypt.c index de830713..4e013379 100644 --- a/tools/cmsencrypt.c +++ b/tools/cmsencrypt.c @@ -71,7 +71,7 @@ static int get_files_size(int argc, char **argv, const char *option, size_t *len return -1; } file = *(++argv); - if (!(fp = fopen(file, "r"))) { + if (!(fp = fopen(file, "rb"))) { fprintf(stderr, "%s: open '%s' failed : %s\n", prog, file, strerror(errno)); return -1; } @@ -155,7 +155,7 @@ int cmsencrypt_main(int argc, char **argv) size_t certlen; if (--argc < 1) goto bad; certfile = *(++argv); - if (!(certfp = fopen(certfile, "r"))) { + if (!(certfp = fopen(certfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, certfile, strerror(errno)); goto end; } @@ -169,7 +169,7 @@ int cmsencrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } @@ -180,7 +180,7 @@ int cmsencrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/cmsparse.c b/tools/cmsparse.c index 24b7f094..55d4b455 100644 --- a/tools/cmsparse.c +++ b/tools/cmsparse.c @@ -45,7 +45,7 @@ int cmsparse_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } diff --git a/tools/cmssign.c b/tools/cmssign.c index faf727dd..69762ec0 100644 --- a/tools/cmssign.c +++ b/tools/cmssign.c @@ -72,7 +72,7 @@ int cmssign_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -82,21 +82,21 @@ int cmssign_main(int argc, char **argv) } else if (!strcmp(*argv, "-cert")) { if (--argc < 1) goto bad; certfile = *(++argv); - if (!(certfp = fopen(certfile, "r"))) { + if (!(certfp = fopen(certfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, certfile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/cmsverify.c b/tools/cmsverify.c index c928abeb..7d0320a4 100644 --- a/tools/cmsverify.c +++ b/tools/cmsverify.c @@ -60,14 +60,14 @@ int cmsverify_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/crlparse.c b/tools/crlparse.c index 15b703d6..b44ef2a5 100644 --- a/tools/crlparse.c +++ b/tools/crlparse.c @@ -49,14 +49,14 @@ int crlparse_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/crlverify.c b/tools/crlverify.c index 8ff24044..c5d29eeb 100644 --- a/tools/crlverify.c +++ b/tools/crlverify.c @@ -55,14 +55,14 @@ int crlverify_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-cacert")) { if (--argc < 1) goto bad; cacertfile = *(++argv); - if (!(cacertfp = fopen(cacertfile, "r"))) { + if (!(cacertfp = fopen(cacertfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, cacertfile, strerror(errno)); goto end; } diff --git a/tools/pbkdf2.c b/tools/pbkdf2.c index 56592d1a..9f59ab39 100644 --- a/tools/pbkdf2.c +++ b/tools/pbkdf2.c @@ -83,7 +83,7 @@ int pbkdf2_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/rand.c b/tools/rand.c index 5c298e26..07af527d 100644 --- a/tools/rand.c +++ b/tools/rand.c @@ -57,7 +57,7 @@ int rand_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/reqgen.c b/tools/reqgen.c index 24563f50..5ecececc 100644 --- a/tools/reqgen.c +++ b/tools/reqgen.c @@ -86,7 +86,7 @@ int reqgen_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -96,7 +96,7 @@ int reqgen_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/reqparse.c b/tools/reqparse.c index 2ab5b1c4..3a9e1c6e 100644 --- a/tools/reqparse.c +++ b/tools/reqparse.c @@ -39,14 +39,14 @@ int reqparse_main(int argc, char **argv) } else if(!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/reqsign.c b/tools/reqsign.c index 5de12cad..793f372f 100644 --- a/tools/reqsign.c +++ b/tools/reqsign.c @@ -86,7 +86,7 @@ int reqsign_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } @@ -116,14 +116,14 @@ int reqsign_main(int argc, char **argv) } else if (!strcmp(*argv, "-cacert")) { if (--argc < 1) goto bad; cacertfile = *(++argv); - if (!(cacertfp = fopen(cacertfile, "r"))) { + if (!(cacertfp = fopen(cacertfile, "rb"))) { fprintf(stderr, "%s: invalid -key_usage value\n", prog); goto end; } } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -133,7 +133,7 @@ int reqsign_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sdfutil.c b/tools/sdfutil.c index 45b67e7b..117b265d 100644 --- a/tools/sdfutil.c +++ b/tools/sdfutil.c @@ -95,14 +95,14 @@ int sdfutil_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/skfutil.c b/tools/skfutil.c index 43a39f5d..a17079b8 100644 --- a/tools/skfutil.c +++ b/tools/skfutil.c @@ -120,14 +120,14 @@ int skfutil_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm2decrypt.c b/tools/sm2decrypt.c index 11b5b65b..2e25707c 100644 --- a/tools/sm2decrypt.c +++ b/tools/sm2decrypt.c @@ -50,7 +50,7 @@ int sm2decrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -60,14 +60,14 @@ int sm2decrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm2encrypt.c b/tools/sm2encrypt.c index 1cc1bcf2..3e758028 100644 --- a/tools/sm2encrypt.c +++ b/tools/sm2encrypt.c @@ -57,7 +57,7 @@ int sm2encrypt_main(int argc, char **argv) } if (--argc < 1) goto bad; pubkeyfile = *(++argv); - if (!(pubkeyfp = fopen(pubkeyfile, "r"))) { + if (!(pubkeyfp = fopen(pubkeyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, pubkeyfile, strerror(errno)); goto end; } @@ -68,21 +68,21 @@ int sm2encrypt_main(int argc, char **argv) } if (--argc < 1) goto bad; certfile = *(++argv); - if (!(certfp = fopen(certfile, "r"))) { + if (!(certfp = fopen(certfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, certfile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm2keygen.c b/tools/sm2keygen.c index 26497137..39af3d12 100644 --- a/tools/sm2keygen.c +++ b/tools/sm2keygen.c @@ -48,14 +48,14 @@ int sm2keygen_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-pubout")) { if (--argc < 1) goto bad; puboutfile = *(++argv); - if (!(puboutfp = fopen(puboutfile, "w"))) { + if (!(puboutfp = fopen(puboutfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm2sign.c b/tools/sm2sign.c index 8e4d2d50..5dc1641e 100644 --- a/tools/sm2sign.c +++ b/tools/sm2sign.c @@ -53,7 +53,7 @@ int sm2sign_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, keyfile, strerror(errno)); goto end; } @@ -66,14 +66,14 @@ int sm2sign_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm2verify.c b/tools/sm2verify.c index caa43869..0e4e91b6 100644 --- a/tools/sm2verify.c +++ b/tools/sm2verify.c @@ -61,7 +61,7 @@ int sm2verify_main(int argc, char **argv) } if (--argc < 1) goto bad; pubkeyfile = *(++argv); - if (!(pubkeyfp = fopen(pubkeyfile, "r"))) { + if (!(pubkeyfp = fopen(pubkeyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, pubkeyfile, strerror(errno)); goto end; } @@ -72,7 +72,7 @@ int sm2verify_main(int argc, char **argv) } if (--argc < 1) goto bad; certfile = *(++argv); - if (!(certfp = fopen(certfile, "r"))) { + if (!(certfp = fopen(certfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, certfile, strerror(errno)); goto end; } @@ -82,14 +82,14 @@ int sm2verify_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-sig")) { if (--argc < 1) goto bad; sigfile = *(++argv); - if (!(sigfp = fopen(sigfile, "r"))) { + if (!(sigfp = fopen(sigfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, sigfile, strerror(errno)); goto end; } diff --git a/tools/sm3.c b/tools/sm3.c index 75efc28b..a68d0950 100644 --- a/tools/sm3.c +++ b/tools/sm3.c @@ -57,7 +57,7 @@ int sm3_main(int argc, char **argv) } else if (!strcmp(*argv, "-pubkey")) { if (--argc < 1) goto bad; pubkeyfile = *(++argv); - if (!(pubkeyfp = fopen(pubkeyfile, "r"))) { + if (!(pubkeyfp = fopen(pubkeyfile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, pubkeyfile, strerror(errno)); goto end; } @@ -67,14 +67,14 @@ int sm3_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "r"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm3hmac.c b/tools/sm3hmac.c index 748c894d..5d1f4c3f 100644 --- a/tools/sm3hmac.c +++ b/tools/sm3hmac.c @@ -68,14 +68,14 @@ int sm3hmac_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm4.c b/tools/sm4.c index bf086591..882eb6c1 100644 --- a/tools/sm4.c +++ b/tools/sm4.c @@ -93,14 +93,14 @@ int sm4_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; } diff --git a/tools/sm9decrypt.c b/tools/sm9decrypt.c index 79bbdc91..4851ef7a 100644 --- a/tools/sm9decrypt.c +++ b/tools/sm9decrypt.c @@ -50,7 +50,7 @@ int sm9decrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { error_print(); goto end; } @@ -63,14 +63,14 @@ int sm9decrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { error_print(); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { error_print(); goto end; } diff --git a/tools/sm9encrypt.c b/tools/sm9encrypt.c index 54020f2b..d7824a69 100644 --- a/tools/sm9encrypt.c +++ b/tools/sm9encrypt.c @@ -49,7 +49,7 @@ int sm9encrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-pubmaster")) { if (--argc < 1) goto bad; mpkfile = *(++argv); - if (!(mpkfp = fopen(mpkfile, "r"))) { + if (!(mpkfp = fopen(mpkfile, "rb"))) { error_print(); goto end; } @@ -59,14 +59,14 @@ int sm9encrypt_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { error_print(); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { error_print(); goto end; } diff --git a/tools/sm9keygen.c b/tools/sm9keygen.c index 0de77652..b077c803 100644 --- a/tools/sm9keygen.c +++ b/tools/sm9keygen.c @@ -58,7 +58,7 @@ int sm9keygen_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { error_print(); goto end; } @@ -71,7 +71,7 @@ int sm9keygen_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { error_print(); goto end; } diff --git a/tools/sm9setup.c b/tools/sm9setup.c index ac7c9411..4dc07fed 100644 --- a/tools/sm9setup.c +++ b/tools/sm9setup.c @@ -57,14 +57,14 @@ int sm9setup_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { error_print(); goto end; } } else if (!strcmp(*argv, "-pubout")) { if (--argc < 1) goto bad; puboutfile = *(++argv); - if (!(puboutfp = fopen(puboutfile, "w"))) { + if (!(puboutfp = fopen(puboutfile, "wb"))) { error_print(); goto end; } diff --git a/tools/sm9sign.c b/tools/sm9sign.c index 7fccd36a..4e3bbba8 100644 --- a/tools/sm9sign.c +++ b/tools/sm9sign.c @@ -52,14 +52,14 @@ int sm9sign_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { error_print(); goto end; } } else if (!strcmp(*argv, "-key")) { if (--argc < 1) goto bad; keyfile = *(++argv); - if (!(keyfp = fopen(keyfile, "r"))) { + if (!(keyfp = fopen(keyfile, "rb"))) { error_print(); goto end; } @@ -69,7 +69,7 @@ int sm9sign_main(int argc, char **argv) } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { error_print(); goto end; } diff --git a/tools/sm9verify.c b/tools/sm9verify.c index 4ce1fc24..dc928139 100644 --- a/tools/sm9verify.c +++ b/tools/sm9verify.c @@ -50,14 +50,14 @@ int sm9verify_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { error_print(); goto end; } } else if (!strcmp(*argv, "-pubmaster")) { if (--argc < 1) goto bad; mpkfile = *(++argv); - if (!(mpkfp = fopen(mpkfile, "r"))) { + if (!(mpkfp = fopen(mpkfile, "rb"))) { error_print(); goto end; } @@ -67,7 +67,7 @@ int sm9verify_main(int argc, char **argv) } else if (!strcmp(*argv, "-sig")) { if (--argc < 1) goto bad; sigfile = *(++argv); - if (!(sigfp = fopen(sigfile, "r"))) { + if (!(sigfp = fopen(sigfile, "rb"))) { error_print(); goto end; } diff --git a/tools/zuc.c b/tools/zuc.c index 4bdc7d07..797fea96 100644 --- a/tools/zuc.c +++ b/tools/zuc.c @@ -77,14 +77,14 @@ int zuc_main(int argc, char **argv) } else if (!strcmp(*argv, "-in")) { if (--argc < 1) goto bad; infile = *(++argv); - if (!(infp = fopen(infile, "r"))) { + if (!(infp = fopen(infile, "rb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, infile, strerror(errno)); goto end; } } else if (!strcmp(*argv, "-out")) { if (--argc < 1) goto bad; outfile = *(++argv); - if (!(outfp = fopen(outfile, "w"))) { + if (!(outfp = fopen(outfile, "wb"))) { fprintf(stderr, "%s: open '%s' failure : %s\n", prog, outfile, strerror(errno)); goto end; }