Third argument to shl_load() is "long address", not a pointer.
[oweals/openssl.git] / apps / smime.c
index 482bd18e4385788b61a3dd4bddbbc77437bae5d0..ef0e4774644542ffca00bd19158697b7bd69db62 100644 (file)
@@ -428,7 +428,7 @@ int MAIN(int argc, char **argv)
        } else keyfile = NULL;
 
        if(keyfile) {
-               key = load_key(bio_err, keyfile, keyform, passin, e,
+               key = load_key(bio_err, keyfile, keyform, 0, passin, e,
                               "signing key file");
                if (!key) {
                        goto end;
@@ -530,9 +530,9 @@ int MAIN(int argc, char **argv)
        } else if(operation == SMIME_PK7OUT) {
                PEM_write_bio_PKCS7(out, p7);
        } else {
-               if(to) BIO_printf(out, "To: %s\r\n", to);
-               if(from) BIO_printf(out, "From: %s\r\n", from);
-               if(subject) BIO_printf(out, "Subject: %s\r\n", subject);
+               if(to) BIO_printf(out, "To: %s\n", to);
+               if(from) BIO_printf(out, "From: %s\n", from);
+               if(subject) BIO_printf(out, "Subject: %s\n", subject);
                if(outformat == FORMAT_SMIME) 
                        SMIME_write_PKCS7(out, p7, in, flags);
                else if(outformat == FORMAT_PEM)