Merge remote-tracking branch 'github/letsencrypt/master' into renewer

Conflicts:
	tests/boulder-integration.sh

tests/boulder-integration.sh

@@ -7,19 +7,29 @@ root="$(mktemp -d)"
 echo "\nRoot integration tests directory: $root"
 store_flags="--config-dir $root/conf --work-dir $root/work"
 
-# first three flags required, rest is handy defaults
-letsencrypt \
-  --server http://localhost:4000/acme/new-reg \
-  --no-verify-ssl \
-  --dvsni-port 5001 \
-  $store_flags \
-  --text \
-  --agree-eula \
-  --email "" \
-  --domains le.wtf \
-  --authenticator standalone \
-  -vvvvvvv \
-  auth
+common() {
+    # first three flags required, rest is handy defaults
+    letsencrypt \
+        --server http://localhost:4000/acme/new-reg \
+        --no-verify-ssl \
+        --dvsni-port 5001 \
+        $store_flags \
+        --text \
+        --agree-eula \
+        --email "" \
+        --authenticator standalone \
+        -vvvvvvv "$@"
+}
+
+common --domains le.wtf auth
+
+export CSR_PATH="${root}/csr.der" OPENSSL_CNF=examples/openssl.cnf
+./examples/generate-csr.sh le.wtf
+common auth --csr "$CSR_PATH" \
+       --cert-path "${root}/csr/cert.pem" \
+       --chain-path "${root}/csr/chain.pem"
+openssl x509 -in "${root}/csr/0000_cert.pem" -text
+openssl x509 -in "${root}/csr/0000_chain.pem" -text
 
 # the following assumes that Boulder issues certificates for less than
 # 10 years, otherwise renewal will not take place