#undef PROG
#define PROG smime_main
-static X509 *load_cert(char *file);
-static EVP_PKEY *load_key(char *file, char *pass);
-static STACK_OF(X509) *load_certs(char *file);
static X509_STORE *setup_verify(char *CAfile, char *CApath);
static int save_certs(char *signerfile, STACK_OF(X509) *signers);
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: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;
#endif
}
-#ifdef CRYPTO_MDEBUG
- CRYPTO_push_info("load encryption certificates");
-#endif
encerts = sk_X509_new_null();
while (*args) {
- if(!(cert = load_cert(*args))) {
+ if(!(cert = load_cert(bio_err,*args,FORMAT_PEM))) {
BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
goto end;
}
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))) {
+ if(!(signer = load_cert(bio_err,signerfile,FORMAT_PEM))) {
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))) {
+ if(!(other = load_certs(bio_err,certfile,FORMAT_PEM))) {
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))) {
+ if(!(recip = load_cert(bio_err,recipfile,FORMAT_PEM))) {
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))) {
+ if(!(key = load_key(bio_err,keyfile, FORMAT_PEM, 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_get0_signers");
-#endif
signers = PKCS7_get0_signers(p7, other, flags);
-#ifdef CRYPTO_MDEBUG
- CRYPTO_pop_info();
- CRYPTO_push_info("save_certs");
-#endif
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);
BIO_free(in);
BIO_free(indata);
BIO_free(out);
- if(passin) Free(passin);
+ if(passin) OPENSSL_free(passin);
return (ret);
}
-static X509 *load_cert(char *file)
-{
- BIO *in;
- X509 *cert;
- if(!(in = BIO_new_file(file, "r"))) return NULL;
- cert = PEM_read_bio_X509(in, NULL, NULL,NULL);
- BIO_free(in);
- return cert;
-}
-
-static EVP_PKEY *load_key(char *file, char *pass)
-{
- BIO *in;
- EVP_PKEY *key;
- if(!(in = BIO_new_file(file, "r"))) return NULL;
- key = PEM_read_bio_PrivateKey(in, NULL,NULL,pass);
- BIO_free(in);
- return key;
-}
-
-static STACK_OF(X509) *load_certs(char *file)
-{
- BIO *in;
- int i;
- STACK_OF(X509) *othercerts;
- STACK_OF(X509_INFO) *allcerts;
- X509_INFO *xi;
- if(!(in = BIO_new_file(file, "r"))) return NULL;
- othercerts = sk_X509_new(NULL);
- if(!othercerts) return NULL;
- allcerts = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
- for(i = 0; i < sk_X509_INFO_num(allcerts); i++) {
- xi = sk_X509_INFO_value (allcerts, i);
- if (xi->x509) {
- sk_X509_push(othercerts, xi->x509);
- xi->x509 = NULL;
- }
- }
- sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
- BIO_free(in);
- return othercerts;
-}
-
static X509_STORE *setup_verify(char *CAfile, char *CApath)
{
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;