projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of EVP_PKEY_ECDSA (now we have EVP_PKEY_EC instead)
[oweals/openssl.git]
/
crypto
/
pkcs7
/
enc.c
diff --git
a/crypto/pkcs7/enc.c
b/crypto/pkcs7/enc.c
index 66a300aee7ccfcc6d64cab65ec9edb7640bb13b7..7417f8a4e00b7f60df63095db052807721915e59 100644
(file)
--- a/
crypto/pkcs7/enc.c
+++ b/
crypto/pkcs7/enc.c
@@
-77,7
+77,7
@@
char *argv[];
const EVP_CIPHER *cipher=NULL;
STACK_OF(X509) *recips=NULL;
const EVP_CIPHER *cipher=NULL;
STACK_OF(X509) *recips=NULL;
-
SSLeay
_add_all_algorithms();
+
OpenSSL
_add_all_algorithms();
data=BIO_new(BIO_s_file());
while(argc > 1)
data=BIO_new(BIO_s_file());
while(argc > 1)
@@
-127,7
+127,14
@@
char *argv[];
#else
PKCS7_set_type(p7,NID_pkcs7_enveloped);
#endif
#else
PKCS7_set_type(p7,NID_pkcs7_enveloped);
#endif
- if(!cipher) cipher = EVP_des_ede3_cbc();
+ if(!cipher) {
+#ifndef OPENSSL_NO_DES
+ cipher = EVP_des_ede3_cbc();
+#else
+ fprintf(stderr, "No cipher selected\n");
+ goto err;
+#endif
+ }
if (!PKCS7_set_cipher(p7,cipher)) goto err;
for(i = 0; i < sk_X509_num(recips); i++) {
if (!PKCS7_set_cipher(p7,cipher)) goto err;
for(i = 0; i < sk_X509_num(recips); i++) {