@@ -99,13 +99,13 @@ def get_chall(authz, typ):
9999def get_any_supported_chall (authz ):
100100 """
101101 Return the first supported challenge from the given authorization.
102- Supports HTTP01, DNS01, and TLSALPN01 challenges .
102+ Supports HTTP01 and DNS01 .
103103
104104 Note: DNS-ACCOUNT-01 challenge type is excluded from the list of supported
105105 challenge types until the Python ACME library adds support for it.
106106 """
107107 for chall_body in authz .body .challenges :
108- if isinstance (chall_body .chall , (challenges .HTTP01 , challenges .DNS01 , challenges . TLSALPN01 )):
108+ if isinstance (chall_body .chall , (challenges .HTTP01 , challenges .DNS01 )):
109109 return chall_body
110110 raise Exception ("No supported challenge types found in authorization" )
111111
@@ -137,8 +137,6 @@ def auth_and_issue(domains, chall_type="dns-01", email=None, cert_output=None, c
137137 cleanup = do_http_challenges (client , authzs )
138138 elif chall_type == "dns-01" :
139139 cleanup = do_dns_challenges (client , authzs )
140- elif chall_type == "tls-alpn-01" :
141- cleanup = do_tlsalpn_challenges (client , authzs )
142140 else :
143141 raise Exception ("invalid challenge type %s" % chall_type )
144142
@@ -199,19 +197,6 @@ def cleanup():
199197 challSrv .remove_http01_response (token )
200198 return cleanup
201199
202- def do_tlsalpn_challenges (client , authzs ):
203- cleanup_hosts = []
204- for a in authzs :
205- c = get_chall (a , challenges .TLSALPN01 )
206- name , value = (a .body .identifier .value , c .key_authorization (client .net .key ))
207- cleanup_hosts .append (name )
208- challSrv .add_tlsalpn01_response (name , value )
209- client .answer_challenge (c , c .response (client .net .key ))
210- def cleanup ():
211- for host in cleanup_hosts :
212- challSrv .remove_tlsalpn01_response (host )
213- return cleanup
214-
215200def expect_problem (problem_type , func ):
216201 """Run a function. If it raises an acme_errors.ValidationError or messages.Error that
217202 contains the given problem_type, return. If it raises no error or the wrong
0 commit comments