From bd5df383944b202b203367d2264029c7163a88d4 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Fri, 16 Feb 2018 15:44:35 -0800
Subject: [PATCH] coverage

---
 acme/acme/crypto_util.py         |   1 -
 acme/acme/crypto_util_test.py    |  24 ++++++++++++++++++++++++
 acme/acme/testdata/cert-nocn.der | Bin 0 -> 1397 bytes
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 acme/acme/testdata/cert-nocn.der

diff --git a/acme/acme/crypto_util.py b/acme/acme/crypto_util.py
index 0931ac14b..a986721f0 100644
--- a/acme/acme/crypto_util.py
+++ b/acme/acme/crypto_util.py
@@ -188,7 +188,6 @@ def make_csr(private_key_pem, domains, must_staple=False):
 
 def _pyopenssl_cert_or_req_all_names(loaded_cert_or_req):
     common_name = loaded_cert_or_req.get_subject().CN
-    # pylint: disable=protected-access
     sans = _pyopenssl_cert_or_req_san(loaded_cert_or_req)
 
     if common_name is None:
diff --git a/acme/acme/crypto_util_test.py b/acme/acme/crypto_util_test.py
index 1d7f83ccf..14aaac8b5 100644
--- a/acme/acme/crypto_util_test.py
+++ b/acme/acme/crypto_util_test.py
@@ -65,6 +65,30 @@ class SSLSocketAndProbeSNITest(unittest.TestCase):
     #    self.assertRaises(errors.Error, self._probe, b'bar')
 
 
+class PyOpenSSLCertOrReqAllNamesTest(unittest.TestCase):
+    """Test for acme.crypto_util._pyopenssl_cert_or_req_all_names."""
+
+    @classmethod
+    def _call(cls, loader, name):
+        # pylint: disable=protected-access
+        from acme.crypto_util import _pyopenssl_cert_or_req_all_names
+        return _pyopenssl_cert_or_req_all_names(loader(name))
+
+    def _call_cert(self, name):
+        return self._call(test_util.load_cert, name)
+
+    def test_cert_one_san_no_common(self):
+        self.assertEqual(self._call_cert('cert-nocn.der'),
+                         ['no-common-name.badssl.com'])
+
+    def test_cert_no_sans_yes_common(self):
+        self.assertEqual(self._call_cert('cert.pem'), ['example.com'])
+
+    def test_cert_two_sans_yes_common(self):
+        self.assertEqual(self._call_cert('cert-san.pem'),
+                         ['example.com', 'www.example.com'])
+
+
 class PyOpenSSLCertOrReqSANTest(unittest.TestCase):
     """Test for acme.crypto_util._pyopenssl_cert_or_req_san."""
 
diff --git a/acme/acme/testdata/cert-nocn.der b/acme/acme/testdata/cert-nocn.der
new file mode 100644
index 0000000000000000000000000000000000000000..59da83ccc6dc3f2a05fe762d6d3372cb446d88ac
GIT binary patch
literal 1397
zcmXqLVl6aiVu@V9%*4pVB#@u9Us#IesM(YUabM(~3ac9MvT<s)d9;1!Wn|=LWiV)*
zX2@;8$;KSY!Y0h*?qn!!APM4d2n)Fvr6!i77Ag29<|SvO76X}v0tS2_Np@lO;KZD?
z{Gt>?DFX?R2$!&+v%jyui@$=iqk>OnZe~epilL2x6-bU**cd7o6zr(rUzDDhmsyoq
zl9`{U5SEyenF3)3rzV#cr78rc7L@_*baph56X!KFH!wCbHUNVtab6<>12ZEdBV$ub
zQ_CoWY$SJw1{(?+2twS=<qR|w=(fDfL_<*nVTgNq!V`1yN=p=+i&9gwVZvO(JU*q#
ziNy-;iA6>Ed4`e(;vm)B!UDdfIVG98F8R5MnRyDq!9E5}j7rD>$H>aS+{DPw02Jq9
zYGPz$IK=YiN6$N!Lz`~|TrG$=Gg;zw%!&-p4N6;oPMx<=Tc^w}=YV&DkI$=3TMqCy
zY}@d&=wuty&lty8VeR_DBi?&nPSFc6UzRSD*z?WN>8RUfv3B+OC9k>W3I?eu7U#71
zRE9penEisy)<ZOC?PiVJtN!QxPnhaeo^AP2<)Y!XyS@jG{0ZKf>$G-j&A)YDMK2k9
zJXb0_en_M$N8^>b*Zo&HTZ^{TMJ*D$lesb6<u;el>U)Rz-AiH|l^)LeDLwhwS|v73
zy^Xs(Wq8!*E&kp8-JytK%_NSSJ>f0EjjX4i{mTxS;h^4nTwr%`!TU@JM|RiHnx855
zwmOGb*1Vo9<<oZYR4WrRBLm~&CdS9W5V>z44-7_GWflnou?CS@pS5qDU+ce3f47#0
zhnCQGX{UoK2C^Upd@N!tB6HsztZwACa?dQ3s1-Dyyl1Jj{cmt0ljUb*{LjL|%*49D
zfCr>p7{q5XV1Q^=Wf3zFVdKzdV`ODzXJ&-6m<$3yiWOKq4crZ^*?52oSQs}MGBPnT
zvlwU_Xu=dSF^b7%l#~<{Tj}c;gOi?Ka(-@pN<N6vcMb?P;9z4*Z{z`HA%iH8iSjJL
z27w0t3w#%Nw|Rne0yQQV<v?{MCqndr^8hfJBd2miB8Q}LND_B;)B|caXzYf$h>?+{
z-k{bX6vj7TLb9iXGJ8r4RN%%kwn;#ppPyV@fMPCC70{=GEV2gDO_F)}y1<~w&Ck=#
zOUzBxOG->BE(UuSIU@i|5MV}NWXSxZ>ULmW+UMOr#Oj|(nYf(rnDb6zkyW<K+3K1F
z1x==X@6{Gw^6L2fYmW8&mvyU`eY*2#c2s%0_%_`yYaguj(%)HrMl$r^z9l!N>|Xz_
z$9{(K%Jus_l6IO3g=HA){+awKO)O|fmTT1Z+#7Ryp6LWmIpcR=gMC-d`J0n;Teo@|
z6zW||Pht60z4=n>rj4&JFaGB1)RMV*x5}HhJC+@K>piVA&uZReo2JynpBFM}&U!55
z^j+hWs<_`F(Vy8@W!9tBm(mqy|NpbeP?kwtdY#U4)jc=2tozb#`ZwppYdhvmr}>U7
l*UbLhr)aUs$L-SL{YJ0C_h)*Gh(7yrDof|BxSMr#8URDu=Gy=O

literal 0
HcmV?d00001