From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 1 Dec 2012 20:01:27 +0000 (+0000)
Subject: Merge branch 'master' of git://git.distorted.org.uk/~mdw/ca
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/ca/commitdiff_plain/ca2cccd082ee593d1593cac40dd51eee98890707?hp=-c

Merge branch 'master' of git://git.distorted.org.uk/~mdw/ca

* 'master' of git://git.distorted.org.uk/~mdw/ca:
  lib/func.tcl: Hack output of `openssl dgst -hex'.
  etc/openssl.conf: Allow `keyEncipherment' for TLS clients.
---

ca2cccd082ee593d1593cac40dd51eee98890707
diff --combined etc/openssl.conf
index 1accc80,847b1f5..1fe673a
--- a/etc/openssl.conf
+++ b/etc/openssl.conf
@@@ -5,7 -5,7 +5,7 @@@
  ###--------------------------------------------------------------------------
  ### Defaults.
  
 -RANDFILE = /dev/urandom
 +RANDFILE = /dev/random
  db_suffix =
  
  ###--------------------------------------------------------------------------
@@@ -103,7 -103,7 +103,7 @@@ crlDistributionPoints = URI:http://www.
  
  [tls-client-extensions]
  basicConstraints = critical, CA:FALSE
- keyUsage = critical, digitalSignature
+ keyUsage = critical, digitalSignature, keyEncipherment
  extendedKeyUsage = clientAuth
  subjectKeyIdentifier = hash
  authorityKeyIdentifier = keyid:always,issuer:always