projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT3548: Remove unsupported platforms.
[oweals/openssl.git]
/
apps
/
rsa.c
diff --git
a/apps/rsa.c
b/apps/rsa.c
index 1e2cd2f0d722895b177e513c57c66b25e5ae3acd..a17708fe9cab0916b3c32dcbce529ecde6da7022 100644
(file)
--- a/
apps/rsa.c
+++ b/
apps/rsa.c
@@
-81,9
+81,13
@@
* -des - encrypt output if PEM format with DES in cbc mode
* -des3 - encrypt output if PEM format
* -idea - encrypt output if PEM format
* -des - encrypt output if PEM format with DES in cbc mode
* -des3 - encrypt output if PEM format
* -idea - encrypt output if PEM format
+ * -seed - encrypt output if PEM format
* -aes128 - encrypt output if PEM format
* -aes192 - encrypt output if PEM format
* -aes256 - encrypt output if PEM format
* -aes128 - encrypt output if PEM format
* -aes192 - encrypt output if PEM format
* -aes256 - encrypt output if PEM format
+ * -camellia128 - encrypt output if PEM format
+ * -camellia192 - encrypt output if PEM format
+ * -camellia256 - encrypt output if PEM format
* -text - print a text version
* -modulus - print the RSA key modulus
* -check - verify key consistency
* -text - print a text version
* -modulus - print the RSA key modulus
* -check - verify key consistency
@@
-220,9
+224,16
@@
bad:
#ifndef OPENSSL_NO_IDEA
BIO_printf(bio_err," -idea encrypt PEM output with cbc idea\n");
#endif
#ifndef OPENSSL_NO_IDEA
BIO_printf(bio_err," -idea encrypt PEM output with cbc idea\n");
#endif
+#ifndef OPENSSL_NO_SEED
+ BIO_printf(bio_err," -seed encrypt PEM output with cbc seed\n");
+#endif
#ifndef OPENSSL_NO_AES
BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
BIO_printf(bio_err," encrypt PEM output with cbc aes\n");
#ifndef OPENSSL_NO_AES
BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
BIO_printf(bio_err," encrypt PEM output with cbc aes\n");
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+ BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+ BIO_printf(bio_err," encrypt PEM output with cbc camellia\n");
#endif
BIO_printf(bio_err," -text print the key in text\n");
BIO_printf(bio_err," -noout don't print key out\n");
#endif
BIO_printf(bio_err," -text print the key in text\n");
BIO_printf(bio_err," -noout don't print key out\n");
@@
-282,7
+293,7
@@
bad:
passin, e, "Private Key");
if (pkey != NULL)
passin, e, "Private Key");
if (pkey != NULL)
-
rsa = pkey == NULL ? NULL :
EVP_PKEY_get1_RSA(pkey);
+
rsa =
EVP_PKEY_get1_RSA(pkey);
EVP_PKEY_free(pkey);
}
EVP_PKEY_free(pkey);
}
@@
-398,6
+409,7
@@
bad:
}
else i=PEM_write_bio_RSAPrivateKey(out,rsa,
enc,NULL,0,NULL,passout);
}
else i=PEM_write_bio_RSAPrivateKey(out,rsa,
enc,NULL,0,NULL,passout);
+#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
EVP_PKEY *pk;
pk = EVP_PKEY_new();
} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
EVP_PKEY *pk;
pk = EVP_PKEY_new();
@@
-409,11
+421,12
@@
bad:
else
i = i2b_PrivateKey_bio(out, pk);
EVP_PKEY_free(pk);
else
i = i2b_PrivateKey_bio(out, pk);
EVP_PKEY_free(pk);
+#endif
} else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
}
} else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
}
- if (
!i
)
+ if (
i <= 0
)
{
BIO_printf(bio_err,"unable to write key\n");
ERR_print_errors(bio_err);
{
BIO_printf(bio_err,"unable to write key\n");
ERR_print_errors(bio_err);