Skip to content

Commit 042c49a

Browse files
sobolevnsobolevn
committed
Address review
1 parent 0bdb97a commit 042c49a

File tree

1 file changed

+53
-80
lines changed

1 file changed

+53
-80
lines changed

‎Modules/_ssl.c‎

Lines changed: 53 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -5792,64 +5792,47 @@ sslmodule_init_constants(PyObject *m)
57925792
return -1;
57935793
}
57945794

5795-
#define _PyModule_ADD_INT_CONST(MODULE, NAME, VALUE) \
5795+
#define ADD_INT_CONST(NAME, VALUE) \
57965796
do { \
5797-
if (PyModule_AddIntConstant(MODULE, NAME, VALUE) < 0) { \
5797+
if (PyModule_AddIntConstant(m, NAME, VALUE) < 0) { \
57985798
return -1; \
57995799
} \
58005800
} while (0)
58015801

5802-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_ZERO_RETURN",
5803-
PY_SSL_ERROR_ZERO_RETURN);
5804-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_WANT_READ",
5805-
PY_SSL_ERROR_WANT_READ);
5806-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_WANT_WRITE",
5807-
PY_SSL_ERROR_WANT_WRITE);
5808-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_WANT_X509_LOOKUP",
5809-
PY_SSL_ERROR_WANT_X509_LOOKUP);
5810-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_SYSCALL",
5811-
PY_SSL_ERROR_SYSCALL);
5812-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_SSL",
5813-
PY_SSL_ERROR_SSL);
5814-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_WANT_CONNECT",
5815-
PY_SSL_ERROR_WANT_CONNECT);
5802+
ADD_INT_CONST("SSL_ERROR_ZERO_RETURN", PY_SSL_ERROR_ZERO_RETURN);
5803+
ADD_INT_CONST("SSL_ERROR_WANT_READ", PY_SSL_ERROR_WANT_READ);
5804+
ADD_INT_CONST("SSL_ERROR_WANT_WRITE", PY_SSL_ERROR_WANT_WRITE);
5805+
ADD_INT_CONST("SSL_ERROR_WANT_X509_LOOKUP", PY_SSL_ERROR_WANT_X509_LOOKUP);
5806+
ADD_INT_CONST("SSL_ERROR_SYSCALL", PY_SSL_ERROR_SYSCALL);
5807+
ADD_INT_CONST("SSL_ERROR_SSL", PY_SSL_ERROR_SSL);
5808+
ADD_INT_CONST("SSL_ERROR_WANT_CONNECT", PY_SSL_ERROR_WANT_CONNECT);
58165809
/* non ssl.h errorcodes */
5817-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_EOF",
5818-
PY_SSL_ERROR_EOF);
5819-
_PyModule_ADD_INT_CONST(m, "SSL_ERROR_INVALID_ERROR_CODE",
5820-
PY_SSL_ERROR_INVALID_ERROR_CODE);
5810+
ADD_INT_CONST("SSL_ERROR_EOF", PY_SSL_ERROR_EOF);
5811+
ADD_INT_CONST("SSL_ERROR_INVALID_ERROR_CODE",
5812+
PY_SSL_ERROR_INVALID_ERROR_CODE);
58215813
/* cert requirements */
5822-
_PyModule_ADD_INT_CONST(m, "CERT_NONE",
5823-
PY_SSL_CERT_NONE);
5824-
_PyModule_ADD_INT_CONST(m, "CERT_OPTIONAL",
5825-
PY_SSL_CERT_OPTIONAL);
5826-
_PyModule_ADD_INT_CONST(m, "CERT_REQUIRED",
5827-
PY_SSL_CERT_REQUIRED);
5814+
ADD_INT_CONST("CERT_NONE", PY_SSL_CERT_NONE);
5815+
ADD_INT_CONST("CERT_OPTIONAL", PY_SSL_CERT_OPTIONAL);
5816+
ADD_INT_CONST("CERT_REQUIRED", PY_SSL_CERT_REQUIRED);
58285817
/* CRL verification for verification_flags */
5829-
_PyModule_ADD_INT_CONST(m, "VERIFY_DEFAULT",
5830-
0);
5831-
_PyModule_ADD_INT_CONST(m, "VERIFY_CRL_CHECK_LEAF",
5832-
X509_V_FLAG_CRL_CHECK);
5833-
_PyModule_ADD_INT_CONST(m, "VERIFY_CRL_CHECK_CHAIN",
5834-
X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
5835-
_PyModule_ADD_INT_CONST(m, "VERIFY_X509_STRICT",
5836-
X509_V_FLAG_X509_STRICT);
5837-
_PyModule_ADD_INT_CONST(m, "VERIFY_ALLOW_PROXY_CERTS",
5838-
X509_V_FLAG_ALLOW_PROXY_CERTS);
5839-
_PyModule_ADD_INT_CONST(m, "VERIFY_X509_TRUSTED_FIRST",
5840-
X509_V_FLAG_TRUSTED_FIRST);
5818+
ADD_INT_CONST("VERIFY_DEFAULT", 0);
5819+
ADD_INT_CONST("VERIFY_CRL_CHECK_LEAF", X509_V_FLAG_CRL_CHECK);
5820+
ADD_INT_CONST("VERIFY_CRL_CHECK_CHAIN",
5821+
X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
5822+
ADD_INT_CONST("VERIFY_X509_STRICT", X509_V_FLAG_X509_STRICT);
5823+
ADD_INT_CONST("VERIFY_ALLOW_PROXY_CERTS", X509_V_FLAG_ALLOW_PROXY_CERTS);
5824+
ADD_INT_CONST("VERIFY_X509_TRUSTED_FIRST", X509_V_FLAG_TRUSTED_FIRST);
58415825

58425826
#ifdef X509_V_FLAG_PARTIAL_CHAIN
5843-
_PyModule_ADD_INT_CONST(m, "VERIFY_X509_PARTIAL_CHAIN",
5844-
X509_V_FLAG_PARTIAL_CHAIN);
5827+
ADD_INT_CONST("VERIFY_X509_PARTIAL_CHAIN", X509_V_FLAG_PARTIAL_CHAIN);
58455828
#endif
58465829

58475830
/* Alert Descriptions from ssl.h */
58485831
/* note RESERVED constants no longer intended for use have been removed */
58495832
/* http://www.iana.org/assignments/tls-parameters/tls-parameters.xml#tls-parameters-6 */
58505833

58515834
#define ADD_AD_CONSTANT(s) \
5852-
_PyModule_ADD_INT_CONST(m, "ALERT_DESCRIPTION_"#s, \
5835+
ADD_INT_CONST("ALERT_DESCRIPTION_"#s, \
58535836
SSL_AD_##s)
58545837

58555838
ADD_AD_CONSTANT(CLOSE_NOTIFY);
@@ -5897,23 +5880,15 @@ sslmodule_init_constants(PyObject *m)
58975880

58985881
/* protocol versions */
58995882
#ifndef OPENSSL_NO_SSL3
5900-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_SSLv3",
5901-
PY_SSL_VERSION_SSL3);
5883+
ADD_INT_CONST("PROTOCOL_SSLv3", PY_SSL_VERSION_SSL3);
59025884
#endif
5903-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_SSLv23",
5904-
PY_SSL_VERSION_TLS);
5905-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLS",
5906-
PY_SSL_VERSION_TLS);
5907-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLS_CLIENT",
5908-
PY_SSL_VERSION_TLS_CLIENT);
5909-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLS_SERVER",
5910-
PY_SSL_VERSION_TLS_SERVER);
5911-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLSv1",
5912-
PY_SSL_VERSION_TLS1);
5913-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLSv1_1",
5914-
PY_SSL_VERSION_TLS1_1);
5915-
_PyModule_ADD_INT_CONST(m, "PROTOCOL_TLSv1_2",
5916-
PY_SSL_VERSION_TLS1_2);
5885+
ADD_INT_CONST("PROTOCOL_SSLv23", PY_SSL_VERSION_TLS);
5886+
ADD_INT_CONST("PROTOCOL_TLS", PY_SSL_VERSION_TLS);
5887+
ADD_INT_CONST("PROTOCOL_TLS_CLIENT", PY_SSL_VERSION_TLS_CLIENT);
5888+
ADD_INT_CONST("PROTOCOL_TLS_SERVER", PY_SSL_VERSION_TLS_SERVER);
5889+
ADD_INT_CONST("PROTOCOL_TLSv1", PY_SSL_VERSION_TLS1);
5890+
ADD_INT_CONST("PROTOCOL_TLSv1_1", PY_SSL_VERSION_TLS1_1);
5891+
ADD_INT_CONST("PROTOCOL_TLSv1_2", PY_SSL_VERSION_TLS1_2);
59175892

59185893
#define ADD_OPTION(NAME, VALUE) if (sslmodule_add_option(m, NAME, (VALUE)) < 0) return -1
59195894

@@ -5961,44 +5936,42 @@ sslmodule_init_constants(PyObject *m)
59615936
#undef ADD_OPTION
59625937

59635938
#ifdef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
5964-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_ALWAYS_CHECK_SUBJECT",
5965-
X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT);
5939+
ADD_INT_CONST("HOSTFLAG_ALWAYS_CHECK_SUBJECT",
5940+
X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT);
59665941
#endif
59675942
#ifdef X509_CHECK_FLAG_NEVER_CHECK_SUBJECT
5968-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_NEVER_CHECK_SUBJECT",
5969-
X509_CHECK_FLAG_NEVER_CHECK_SUBJECT);
5943+
ADD_INT_CONST("HOSTFLAG_NEVER_CHECK_SUBJECT",
5944+
X509_CHECK_FLAG_NEVER_CHECK_SUBJECT);
59705945
#endif
59715946
#ifdef X509_CHECK_FLAG_NO_WILDCARDS
5972-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_NO_WILDCARDS",
5973-
X509_CHECK_FLAG_NO_WILDCARDS);
5947+
ADD_INT_CONST("HOSTFLAG_NO_WILDCARDS",
5948+
X509_CHECK_FLAG_NO_WILDCARDS);
59745949
#endif
59755950
#ifdef X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS
5976-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_NO_PARTIAL_WILDCARDS",
5977-
X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
5951+
ADD_INT_CONST("HOSTFLAG_NO_PARTIAL_WILDCARDS",
5952+
X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
59785953
#endif
59795954
#ifdef X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS
5980-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_MULTI_LABEL_WILDCARDS",
5981-
X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS);
5955+
ADD_INT_CONST("HOSTFLAG_MULTI_LABEL_WILDCARDS",
5956+
X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS);
59825957
#endif
59835958
#ifdef X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS
5984-
_PyModule_ADD_INT_CONST(m, "HOSTFLAG_SINGLE_LABEL_SUBDOMAINS",
5985-
X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS);
5959+
ADD_INT_CONST("HOSTFLAG_SINGLE_LABEL_SUBDOMAINS",
5960+
X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS);
59865961
#endif
59875962

59885963
/* file types */
5989-
_PyModule_ADD_INT_CONST(m, "ENCODING_PEM", PY_SSL_ENCODING_PEM);
5990-
_PyModule_ADD_INT_CONST(m, "ENCODING_DER", PY_SSL_ENCODING_DER);
5964+
ADD_INT_CONST("ENCODING_PEM", PY_SSL_ENCODING_PEM);
5965+
ADD_INT_CONST("ENCODING_DER", PY_SSL_ENCODING_DER);
59915966

59925967
/* protocol versions */
5993-
_PyModule_ADD_INT_CONST(m, "PROTO_MINIMUM_SUPPORTED",
5994-
PY_PROTO_MINIMUM_SUPPORTED);
5995-
_PyModule_ADD_INT_CONST(m, "PROTO_MAXIMUM_SUPPORTED",
5996-
PY_PROTO_MAXIMUM_SUPPORTED);
5997-
_PyModule_ADD_INT_CONST(m, "PROTO_SSLv3", PY_PROTO_SSLv3);
5998-
_PyModule_ADD_INT_CONST(m, "PROTO_TLSv1", PY_PROTO_TLSv1);
5999-
_PyModule_ADD_INT_CONST(m, "PROTO_TLSv1_1", PY_PROTO_TLSv1_1);
6000-
_PyModule_ADD_INT_CONST(m, "PROTO_TLSv1_2", PY_PROTO_TLSv1_2);
6001-
_PyModule_ADD_INT_CONST(m, "PROTO_TLSv1_3", PY_PROTO_TLSv1_3);
5968+
ADD_INT_CONST("PROTO_MINIMUM_SUPPORTED", PY_PROTO_MINIMUM_SUPPORTED);
5969+
ADD_INT_CONST("PROTO_MAXIMUM_SUPPORTED", PY_PROTO_MAXIMUM_SUPPORTED);
5970+
ADD_INT_CONST("PROTO_SSLv3", PY_PROTO_SSLv3);
5971+
ADD_INT_CONST("PROTO_TLSv1", PY_PROTO_TLSv1);
5972+
ADD_INT_CONST("PROTO_TLSv1_1", PY_PROTO_TLSv1_1);
5973+
ADD_INT_CONST("PROTO_TLSv1_2", PY_PROTO_TLSv1_2);
5974+
ADD_INT_CONST("PROTO_TLSv1_3", PY_PROTO_TLSv1_3);
60025975

60035976
#define addbool(m, key, value) \
60045977
do { \

0 commit comments

Comments
 (0)