diff options
| author | nectar <nectar@FreeBSD.org> | 2005-02-25 05:49:44 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2005-02-25 05:49:44 +0000 |
| commit | ced877b043d77d97f1ad196f15b25ed720c1fcdc (patch) | |
| tree | a843375628b8f7847c8a433651d5c12a4660558c /crypto/openssl/apps | |
| parent | 52bc459a40672bffc62b2ff9c2578dbe8832a0b8 (diff) | |
| download | FreeBSD-src-ced877b043d77d97f1ad196f15b25ed720c1fcdc.zip FreeBSD-src-ced877b043d77d97f1ad196f15b25ed720c1fcdc.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.7e.
Diffstat (limited to 'crypto/openssl/apps')
| -rw-r--r-- | crypto/openssl/apps/openssl.cnf | 4 | ||||
| -rw-r--r-- | crypto/openssl/apps/speed.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssl/apps/openssl.cnf b/crypto/openssl/apps/openssl.cnf index 9256b4d..79fd471 100644 --- a/crypto/openssl/apps/openssl.cnf +++ b/crypto/openssl/apps/openssl.cnf @@ -45,8 +45,8 @@ new_certs_dir = $dir/newcerts # default place for new certs. certificate = $dir/cacert.pem # The CA certificate serial = $dir/serial # The current serial number -#crlnumber = $dir/crlnumber # the current crl number - # must be commented out to leave a V1 CRL +#crlnumber = $dir/crlnumber # the current crl number must be + # commented out to leave a V1 CRL crl = $dir/crl.pem # The current CRL private_key = $dir/private/cakey.pem# The private key RANDFILE = $dir/private/.rand # private random number file diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 2412200..5ed510c 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -1395,6 +1395,7 @@ int MAIN(int argc, char **argv) EVP_DecryptInit_ex(&ctx,evp_cipher,NULL,key16,iv); else EVP_EncryptInit_ex(&ctx,evp_cipher,NULL,key16,iv); + EVP_CIPHER_CTX_set_padding(&ctx, 0); Time_F(START); if(decrypt) |
