#define SMIME_VERIFY 4
#define SMIME_PK7OUT 5
+int MAIN(int, char **);
+
int MAIN(int argc, char **argv)
{
int operation = 0;
int badarg = 0;
int flags = PKCS7_DETACHED;
char *to = NULL, *from = NULL, *subject = NULL;
- char *CAfile = NULL, *CApath = NULL, *passin = NULL;
-
+ char *CAfile = NULL, *CApath = NULL;
+ char *passargin = NULL, *passin = NULL;
+ char *inrand = NULL;
+ int need_rand = 0;
args = argv + 1;
ret = 1;
flags |= PKCS7_BINARY;
else if (!strcmp (*args, "-nosigs"))
flags |= PKCS7_NOSIGS;
- else if (!strcmp(*argv,"-passin")) {
- if (--argc < 1) badarg = 1;
- else passin= *(++argv);
- } else if (!strcmp(*argv,"-envpassin")) {
- if (--argc < 1) badarg = 1;
- else if(!(passin= getenv(*(++argv)))) {
- BIO_printf(bio_err,
- "Can't read environment variable %s\n",
- *argv);
- badarg = 1;
- }
+ else if (!strcmp(*args,"-rand")) {
+ if (args[1]) {
+ args++;
+ inrand = *args;
+ } else badarg = 1;
+ need_rand = 1;
+ } else if (!strcmp(*args,"-passin")) {
+ if (args[1]) {
+ args++;
+ passargin = *args;
+ } else badarg = 1;
} else if (!strcmp (*args, "-to")) {
if (args[1]) {
args++;
BIO_printf(bio_err, "No signer certificate specified\n");
badarg = 1;
}
+ need_rand = 1;
} else if(operation == SMIME_DECRYPT) {
if(!recipfile) {
BIO_printf(bio_err, "No recipient certificate and key specified\n");
BIO_printf(bio_err, "No recipient(s) certificate(s) specified\n");
badarg = 1;
}
+ need_rand = 1;
} else if(!operation) badarg = 1;
if (badarg) {
BIO_printf (bio_err, "-text include or delete text MIME headers\n");
BIO_printf (bio_err, "-CApath dir trusted certificates directory\n");
BIO_printf (bio_err, "-CAfile file trusted certificates file\n");
+ BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+ BIO_printf(bio_err, " load the file (or the files in the directory) into\n");
+ BIO_printf(bio_err, " the random number generator\n");
BIO_printf (bio_err, "cert.pem recipient certificate(s) for encryption\n");
goto end;
}
+ if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+ BIO_printf(bio_err, "Error getting password\n");
+ goto end;
+ }
+
+ if (need_rand) {
+ app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+ if (inrand != NULL)
+ BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+ app_RAND_load_files(inrand));
+ }
+
ret = 2;
if(operation != SMIME_SIGN) flags &= ~PKCS7_DETACHED;
goto end;
#endif
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load encryption certificates");
-#endif
encerts = sk_X509_new_null();
while (*args) {
if(!(cert = load_cert(*args))) {
- BIO_printf(bio_err, "Can't read recipent certificate file %s\n", *args);
+ BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
goto end;
}
sk_X509_push(encerts, cert);
cert = NULL;
args++;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
if(signerfile && (operation == SMIME_SIGN)) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load signer certificate");
-#endif
if(!(signer = load_cert(signerfile))) {
BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile);
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
if(certfile) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load other certfiles");
-#endif
if(!(other = load_certs(certfile))) {
BIO_printf(bio_err, "Can't read certificate file %s\n", certfile);
ERR_print_errors(bio_err);
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
if(recipfile && (operation == SMIME_DECRYPT)) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load recipient certificate");
-#endif
if(!(recip = load_cert(recipfile))) {
BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile);
ERR_print_errors(bio_err);
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
if(operation == SMIME_DECRYPT) {
} else keyfile = NULL;
if(keyfile) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load keyfile");
-#endif
if(!(key = load_key(keyfile, passin))) {
BIO_printf(bio_err, "Can't read recipient certificate file %s\n", keyfile);
ERR_print_errors(bio_err);
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("open input files");
-#endif
if (infile) {
if (!(in = BIO_new_file(infile, inmode))) {
BIO_printf (bio_err,
goto end;
}
} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("open output files");
-#endif
if (outfile) {
if (!(out = BIO_new_file(outfile, outmode))) {
BIO_printf (bio_err,
goto end;
}
} else out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
if(operation == SMIME_VERIFY) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("setup_verify");
-#endif
if(!(store = setup_verify(CAfile, CApath))) goto end;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
ret = 3;
if(operation == SMIME_ENCRYPT) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("PKCS7_encrypt");
-#endif
p7 = PKCS7_encrypt(encerts, in, cipher, flags);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
} else if(operation == SMIME_SIGN) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("PKCS7_sign");
-#endif
p7 = PKCS7_sign(signer, key, other, in, flags);
BIO_reset(in);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
} else {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("SMIME_read_PKCS7");
-#endif
if(!(p7 = SMIME_read_PKCS7(in, &indata))) {
BIO_printf(bio_err, "Error reading S/MIME message\n");
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
}
if(!p7) {
ret = 4;
if(operation == SMIME_DECRYPT) {
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("PKCS7_decrypt");
-#endif
if(!PKCS7_decrypt(p7, key, recip, out, flags)) {
BIO_printf(bio_err, "Error decrypting PKCS#7 structure\n");
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
} else if(operation == SMIME_VERIFY) {
STACK_OF(X509) *signers;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("PKCS7_verify");
-#endif
if(PKCS7_verify(p7, other, store, indata, out, flags)) {
BIO_printf(bio_err, "Verification Successful\n");
} else {
BIO_printf(bio_err, "Verification Failure\n");
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("PKCS7_iget_signers");
-#endif
- signers = PKCS7_iget_signers(p7, other, flags);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("save_certs");
-#endif
+ signers = PKCS7_get0_signers(p7, other, flags);
if(!save_certs(signerfile, signers)) {
BIO_printf(bio_err, "Error writing signers to %s\n",
signerfile);
ret = 5;
goto end;
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
sk_X509_free(signers);
} else if(operation == SMIME_PK7OUT) {
PEM_write_bio_PKCS7(out, p7);
}
ret = 0;
end:
-#ifdef CRYPTO_MDEBUG
- CRYPTO_remove_all_info();
-#endif
+ if (need_rand)
+ app_RAND_write_file(NULL, bio_err);
if(ret) ERR_print_errors(bio_err);
sk_X509_pop_free(encerts, X509_free);
sk_X509_pop_free(other, X509_free);
BIO_free(in);
BIO_free(indata);
BIO_free(out);
+ if(passin) Free(passin);
return (ret);
}
BIO *in;
EVP_PKEY *key;
if(!(in = BIO_new_file(file, "r"))) return NULL;
- key = PEM_read_bio_PrivateKey(in, NULL,PEM_cb,pass);
+ key = PEM_read_bio_PrivateKey(in, NULL,NULL,pass);
BIO_free(in);
return key;
}
{
X509_STORE *store;
X509_LOOKUP *lookup;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("X509_STORE_new");
-#endif
if(!(store = X509_STORE_new())) goto end;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("X509_STORE_add_lookup(...file)");
-#endif
lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
if (lookup == NULL) goto end;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("X509_LOOKUP_load_file");
-#endif
if (CAfile) {
if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) {
BIO_printf(bio_err, "Error loading file %s\n", CAfile);
}
} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("X509_STORE_add_lookup(...hash_dir)");
-#endif
lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
if (lookup == NULL) goto end;
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("X509_LOOKUP_add_dir");
-#endif
if (CApath) {
if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) {
BIO_printf(bio_err, "Error loading directory %s\n", CApath);
goto end;
}
} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
-#endif
ERR_clear_error();
return store;
return NULL;
}
-int save_certs(char *signerfile, STACK_OF(X509) *signers)
+static int save_certs(char *signerfile, STACK_OF(X509) *signers)
{
int i;
BIO *tmp;
projects / openssl.git / blobdiff