raannakasturi commited on
Commit
f74c8dc
·
1 Parent(s): 9373427

Refactor key_type variable to use "ecc" instead of "ec"

Browse files
Files changed (5) hide show
  1. acme_tools.py +1 -1
  2. app.py +2 -2
  3. genPVTCSR.py +1 -1
  4. main.py +1 -1
  5. tools.py +1 -1
acme_tools.py CHANGED
@@ -16,7 +16,7 @@ def pg_client(directory, key_type="rsa", key_size=None, key_curve=None):
16
  directory_obj = messages.Directory.from_json(net.get(directory).json())
17
  acme_client = client.ClientV2(directory_obj, net=net)
18
  return acme_client
19
- elif key_type.lower() == "ec":
20
  if key_curve == "" or key_curve == None:
21
  key_curve = "ec256"
22
  if key_curve == 'SECP256R1' or key_curve == 'ec256':
 
16
  directory_obj = messages.Directory.from_json(net.get(directory).json())
17
  acme_client = client.ClientV2(directory_obj, net=net)
18
  return acme_client
19
+ elif key_type.lower() == "ecc":
20
  if key_curve == "" or key_curve == None:
21
  key_curve = "ec256"
22
  if key_curve == 'SECP256R1' or key_curve == 'ec256':
app.py CHANGED
@@ -7,7 +7,7 @@ from tools import write_file
7
  def gen_ssl(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
8
  if key_type == "rsa":
9
  key_curve = None
10
- elif key_type == "ec":
11
  key_size = None
12
  else:
13
  key_curve = None
@@ -57,7 +57,7 @@ def app():
57
  email_input = gr.Textbox(label="Enter your Email ID", placeholder="[email protected]", type="text", interactive=True)
58
  with gr.Row():
59
  ca_server = gr.Dropdown(label="Select Certificate Authority", choices=["Let's Encrypt (Testing)","Let's Encrypt", "Google (Testing)","Google", "Buypass (Testing)", "Buypass", "ZeroSSL", "SSL.com"], interactive=True, value="Let's Encrypt (Testing)")
60
- key_type = gr.Radio(label="Select SSL key type", choices=["rsa", "ec"], interactive=True, value='ec')
61
  key_size_dropdown = gr.Dropdown(label="Select Key Size", choices=['2048', '4096'], value='4096', visible=False) # Initially visible
62
  key_curve_dropdown = gr.Dropdown(label="Select Key Curve", choices=['SECP256R1', 'SECP384R1'], value='SECP256R1', visible=True) # Initially hidden
63
  ca_server.change(fn=update_buypass_options, inputs=ca_server, outputs=key_curve_dropdown)
 
7
  def gen_ssl(i_domains, wildcard, email, ca_server, key_type, key_size=None, key_curve=None):
8
  if key_type == "rsa":
9
  key_curve = None
10
+ elif key_type == "ecc":
11
  key_size = None
12
  else:
13
  key_curve = None
 
57
  email_input = gr.Textbox(label="Enter your Email ID", placeholder="[email protected]", type="text", interactive=True)
58
  with gr.Row():
59
  ca_server = gr.Dropdown(label="Select Certificate Authority", choices=["Let's Encrypt (Testing)","Let's Encrypt", "Google (Testing)","Google", "Buypass (Testing)", "Buypass", "ZeroSSL", "SSL.com"], interactive=True, value="Let's Encrypt (Testing)")
60
+ key_type = gr.Radio(label="Select SSL key type", choices=["rsa", "ecc"], interactive=True, value='ecc')
61
  key_size_dropdown = gr.Dropdown(label="Select Key Size", choices=['2048', '4096'], value='4096', visible=False) # Initially visible
62
  key_curve_dropdown = gr.Dropdown(label="Select Key Curve", choices=['SECP256R1', 'SECP384R1'], value='SECP256R1', visible=True) # Initially hidden
63
  ca_server.change(fn=update_buypass_options, inputs=ca_server, outputs=key_curve_dropdown)
genPVTCSR.py CHANGED
@@ -6,7 +6,7 @@ from cryptography.x509.oid import NameOID
6
  from typing import List, Tuple
7
 
8
  def gen_pvt(key_type: str, key_size: int = None, key_curve: str = None) -> bytes:
9
- if key_type.lower() == "ec":
10
  if key_curve == 'SECP256R1' or key_curve == 'ec256':
11
  key = ec.generate_private_key(ec.SECP256R1(), default_backend())
12
  elif key_curve == 'SECP384R1' or key_curve == 'ec384':
 
6
  from typing import List, Tuple
7
 
8
  def gen_pvt(key_type: str, key_size: int = None, key_curve: str = None) -> bytes:
9
+ if key_type.lower() == "ecc":
10
  if key_curve == 'SECP256R1' or key_curve == 'ec256':
11
  key = ec.generate_private_key(ec.SECP256R1(), default_backend())
12
  elif key_curve == 'SECP384R1' or key_curve == 'ec384':
main.py CHANGED
@@ -151,7 +151,7 @@ if __name__ == "__main__":
151
  DOMAINS = 'raannakasturi.eu.org'
152
  ca_server = "Google" #Let's Encrypt (Testing), Let's Encrypt, Google (Testing), Google, Buypass (Testing), Buypass, ZeroSSL, SSL.com
153
  EMAIL = "[email protected]"
154
- key_type = "ec"
155
  key_curve = "ec384"
156
  key_size = None
157
  KID = None
 
151
  DOMAINS = 'raannakasturi.eu.org'
152
  ca_server = "Google" #Let's Encrypt (Testing), Let's Encrypt, Google (Testing), Google, Buypass (Testing), Buypass, ZeroSSL, SSL.com
153
  EMAIL = "[email protected]"
154
+ key_type = "ecc"
155
  key_curve = "ec384"
156
  key_size = None
157
  KID = None
tools.py CHANGED
@@ -20,7 +20,7 @@ def get_ca_server(caserver, key_type):
20
  urls = {
21
  "SSL.com": {
22
  "rsa": "https://acme.ssl.com/sslcom-dv-rsa",
23
- "ec": "https://acme.ssl.com/sslcom-dv-ecc"
24
  },
25
  "Let's Encrypt (Testing)": "https://acme-staging-v02.api.letsencrypt.org/directory",
26
  "Let's Encrypt": DEFAULT_LET_ENCRYPT_URL,
 
20
  urls = {
21
  "SSL.com": {
22
  "rsa": "https://acme.ssl.com/sslcom-dv-rsa",
23
+ "ecc": "https://acme.ssl.com/sslcom-dv-ecc"
24
  },
25
  "Let's Encrypt (Testing)": "https://acme-staging-v02.api.letsencrypt.org/directory",
26
  "Let's Encrypt": DEFAULT_LET_ENCRYPT_URL,