Merged trunk with contrib openssl

FossilOrigin-Name: 1c4700016d8da96d112920399d58ab92031eca7dd215be91480376dea2fd5143
bsdmakefiles
root 3 years ago
commit cefec68c4d
  1. 4
      src/Config.mak
  2. 12
      src/ac/config.ktv

@ -1,8 +1,8 @@
#
# OpenSSL definitions
#
# OPENSSL_VERSION=openssl-1.0.1i
USE_CONTRIB_OPENSSL=0
OPENSSL_VERSION=openssl-1.0.1i
USE_CONTRIB_OPENSSL=1
# GnuTLS definitions
# GNUTLS_VERSION=3.3.9

@ -49,10 +49,14 @@ capwap-control-ip-address/wtps.0:Word:0
#capwap-control-ip-address/wtps.1:Word:11
cisco/ssl-keyfile:Str:"../../ssl/certs/ac-cisco.key"
cisco/ssl-certfile:Str:"../../ssl/certs/ac-cisco.pem"
cisco/ssl-cipher:Str:NORMAL
#cisco/ssl-cipher:Str:+DHE-RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK
#cisco/ssl-keyfile:Str:"../../ssl/certs/ac-cisco.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/ac-cisco.pem"
#cisco/ssl-keyfile:Str:"../../ssl/certs/int-ca.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/int-ca.crt"
cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/int-ca.key"
cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/int-ca.crt"
cisco/ssl-cipher:Str:DEFAULT:!ECDH
#cisco/ssl-cipher:Str:+DHE-RSA:+AES-256-CBC:+AES-128-CBC:+SHA1
cisco/ssl-dhbits:Word:2048
capwap/ssl-cipher:Str:+DHE-RSA:+RSA:+AES-256-CBC:+AES-128-CBC:+SHA1:+PSK

Loading…
Cancel
Save