diff --git a/.idea/php.xml b/.idea/php.xml index 83ff6183..044deecd 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -58,7 +58,7 @@ - + /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini diff --git a/PhpStormStubsMap.php b/PhpStormStubsMap.php index a0430774..d208337a 100644 --- a/PhpStormStubsMap.php +++ b/PhpStormStubsMap.php @@ -4023,6 +4023,8 @@ const FUNCTIONS = array ( 'socket_strerror' => 'sockets/sockets.php', 'socket_write' => 'sockets/sockets.php', 'sodium_add' => 'sodium/sodium.php', + 'sodium_base642bin' => 'sodium/sodium.php', + 'sodium_bin2base64' => 'sodium/sodium.php', 'sodium_bin2hex' => 'sodium/sodium.php', 'sodium_compare' => 'sodium/sodium.php', 'sodium_crypto_aead_aes256gcm_decrypt' => 'sodium/sodium.php', @@ -4035,6 +4037,9 @@ const FUNCTIONS = array ( 'sodium_crypto_aead_chacha20poly1305_ietf_encrypt' => 'sodium/sodium.php', 'sodium_crypto_aead_chacha20poly1305_ietf_keygen' => 'sodium/sodium.php', 'sodium_crypto_aead_chacha20poly1305_keygen' => 'sodium/sodium.php', + 'sodium_crypto_aead_xchacha20poly1305_ietf_decrypt' => 'sodium/sodium.php', + 'sodium_crypto_aead_xchacha20poly1305_ietf_encrypt' => 'sodium/sodium.php', + 'sodium_crypto_aead_xchacha20poly1305_ietf_keygen' => 'sodium/sodium.php', 'sodium_crypto_auth' => 'sodium/sodium.php', 'sodium_crypto_auth_keygen' => 'sodium/sodium.php', 'sodium_crypto_auth_verify' => 'sodium/sodium.php', @@ -4067,12 +4072,19 @@ const FUNCTIONS = array ( 'sodium_crypto_pwhash_scryptsalsa208sha256_str' => 'sodium/sodium.php', 'sodium_crypto_pwhash_scryptsalsa208sha256_str_verify' => 'sodium/sodium.php', 'sodium_crypto_pwhash_str' => 'sodium/sodium.php', + 'sodium_crypto_pwhash_str_needs_rehash' => 'sodium/sodium.php', 'sodium_crypto_pwhash_str_verify' => 'sodium/sodium.php', 'sodium_crypto_scalarmult' => 'sodium/sodium.php', 'sodium_crypto_scalarmult_base' => 'sodium/sodium.php', 'sodium_crypto_secretbox' => 'sodium/sodium.php', 'sodium_crypto_secretbox_keygen' => 'sodium/sodium.php', 'sodium_crypto_secretbox_open' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_init_pull' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_init_push' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_keygen' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_pull' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_push' => 'sodium/sodium.php', + 'sodium_crypto_secretstream_xchacha20poly1305_rekey' => 'sodium/sodium.php', 'sodium_crypto_shorthash' => 'sodium/sodium.php', 'sodium_crypto_shorthash_keygen' => 'sodium/sodium.php', 'sodium_crypto_sign' => 'sodium/sodium.php', @@ -5174,8 +5186,10 @@ const CONSTANTS = array ( 'CURLAUTH_ANY' => 'curl/curl_d.php', 'CURLAUTH_ANYSAFE' => 'curl/curl_d.php', 'CURLAUTH_BASIC' => 'curl/curl_d.php', + 'CURLAUTH_BEARER' => 'curl/curl_d.php', 'CURLAUTH_DIGEST' => 'curl/curl_d.php', 'CURLAUTH_DIGEST_IE' => 'curl/curl_d.php', + 'CURLAUTH_GSSAPI' => 'curl/curl_d.php', 'CURLAUTH_GSSNEGOTIATE' => 'curl/curl_d.php', 'CURLAUTH_NEGOTIATE' => 'curl/curl_d.php', 'CURLAUTH_NONE' => 'curl/curl_d.php', @@ -5281,15 +5295,20 @@ const CONSTANTS = array ( 'CURLHEADER_SEPARATE' => 'curl/curl_d.php', 'CURLHEADER_UNIFIED' => 'curl/curl_d.php', 'CURLINFO_APPCONNECT_TIME' => 'curl/curl_d.php', + 'CURLINFO_APPCONNECT_TIME_T' => 'curl/curl_d.php', 'CURLINFO_CERTINFO' => 'curl/curl_d.php', 'CURLINFO_CONDITION_UNMET' => 'curl/curl_d.php', 'CURLINFO_CONNECT_TIME' => 'curl/curl_d.php', + 'CURLINFO_CONNECT_TIME_T' => 'curl/curl_d.php', 'CURLINFO_CONTENT_LENGTH_DOWNLOAD' => 'curl/curl_d.php', + 'CURLINFO_CONTENT_LENGTH_DOWNLOAD_T' => 'curl/curl_d.php', 'CURLINFO_CONTENT_LENGTH_UPLOAD' => 'curl/curl_d.php', + 'CURLINFO_CONTENT_LENGTH_UPLOAD_T' => 'curl/curl_d.php', 'CURLINFO_CONTENT_TYPE' => 'curl/curl_d.php', 'CURLINFO_COOKIELIST' => 'curl/curl_d.php', 'CURLINFO_EFFECTIVE_URL' => 'curl/curl_d.php', 'CURLINFO_FILETIME' => 'curl/curl_d.php', + 'CURLINFO_FILETIME_T' => 'curl/curl_d.php', 'CURLINFO_FTP_ENTRY_PATH' => 'curl/curl_d.php', 'CURLINFO_HEADER_OUT' => 'curl/curl_d.php', 'CURLINFO_HEADER_SIZE' => 'curl/curl_d.php', @@ -5301,9 +5320,11 @@ const CONSTANTS = array ( 'CURLINFO_LOCAL_IP' => 'curl/curl_d.php', 'CURLINFO_LOCAL_PORT' => 'curl/curl_d.php', 'CURLINFO_NAMELOOKUP_TIME' => 'curl/curl_d.php', + 'CURLINFO_NAMELOOKUP_TIME_T' => 'curl/curl_d.php', 'CURLINFO_NUM_CONNECTS' => 'curl/curl_d.php', 'CURLINFO_OS_ERRNO' => 'curl/curl_d.php', 'CURLINFO_PRETRANSFER_TIME' => 'curl/curl_d.php', + 'CURLINFO_PRETRANSFER_TIME_T' => 'curl/curl_d.php', 'CURLINFO_PRIMARY_IP' => 'curl/curl_d.php', 'CURLINFO_PRIMARY_PORT' => 'curl/curl_d.php', 'CURLINFO_PRIVATE' => 'curl/curl_d.php', @@ -5312,6 +5333,7 @@ const CONSTANTS = array ( 'CURLINFO_PROXY_SSL_VERIFYRESULT' => 'curl/curl_d.php', 'CURLINFO_REDIRECT_COUNT' => 'curl/curl_d.php', 'CURLINFO_REDIRECT_TIME' => 'curl/curl_d.php', + 'CURLINFO_REDIRECT_TIME_T' => 'curl/curl_d.php', 'CURLINFO_REDIRECT_URL' => 'curl/curl_d.php', 'CURLINFO_REQUEST_SIZE' => 'curl/curl_d.php', 'CURLINFO_RESPONSE_CODE' => 'curl/curl_d.php', @@ -5321,13 +5343,19 @@ const CONSTANTS = array ( 'CURLINFO_RTSP_SESSION_ID' => 'curl/curl_d.php', 'CURLINFO_SCHEME' => 'curl/curl_d.php', 'CURLINFO_SIZE_DOWNLOAD' => 'curl/curl_d.php', + 'CURLINFO_SIZE_DOWNLOAD_T' => 'curl/curl_d.php', 'CURLINFO_SIZE_UPLOAD' => 'curl/curl_d.php', + 'CURLINFO_SIZE_UPLOAD_T' => 'curl/curl_d.php', 'CURLINFO_SPEED_DOWNLOAD' => 'curl/curl_d.php', + 'CURLINFO_SPEED_DOWNLOAD_T' => 'curl/curl_d.php', 'CURLINFO_SPEED_UPLOAD' => 'curl/curl_d.php', + 'CURLINFO_SPEED_UPLOAD_T' => 'curl/curl_d.php', 'CURLINFO_SSL_ENGINES' => 'curl/curl_d.php', 'CURLINFO_SSL_VERIFYRESULT' => 'curl/curl_d.php', 'CURLINFO_STARTTRANSFER_TIME' => 'curl/curl_d.php', + 'CURLINFO_STARTTRANSFER_TIME_T' => 'curl/curl_d.php', 'CURLINFO_TOTAL_TIME' => 'curl/curl_d.php', + 'CURLINFO_TOTAL_TIME_T' => 'curl/curl_d.php', 'CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE' => 'curl/curl_d.php', 'CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE' => 'curl/curl_d.php', 'CURLMOPT_MAXCONNECTS' => 'curl/curl_d.php', @@ -5344,6 +5372,7 @@ const CONSTANTS = array ( 'CURLM_INTERNAL_ERROR' => 'curl/curl_d.php', 'CURLM_OK' => 'curl/curl_d.php', 'CURLM_OUT_OF_MEMORY' => 'curl/curl_d.php', + 'CURLOPT_ABSTRACT_UNIX_SOCKET' => 'curl/curl_d.php', 'CURLOPT_ACCEPTTIMEOUT_MS' => 'curl/curl_d.php', 'CURLOPT_ACCEPT_ENCODING' => 'curl/curl_d.php', 'CURLOPT_ADDRESS_SCOPE' => 'curl/curl_d.php', @@ -5369,11 +5398,13 @@ const CONSTANTS = array ( 'CURLOPT_CUSTOMREQUEST' => 'curl/curl_d.php', 'CURLOPT_DEFAULT_PROTOCOL' => 'curl/curl_d.php', 'CURLOPT_DIRLISTONLY' => 'curl/curl_d.php', + 'CURLOPT_DISALLOW_USERNAME_IN_URL' => 'curl/curl_d.php', 'CURLOPT_DNS_CACHE_TIMEOUT' => 'curl/curl_d.php', 'CURLOPT_DNS_INTERFACE' => 'curl/curl_d.php', 'CURLOPT_DNS_LOCAL_IP4' => 'curl/curl_d.php', 'CURLOPT_DNS_LOCAL_IP6' => 'curl/curl_d.php', 'CURLOPT_DNS_SERVERS' => 'curl/curl_d.php', + 'CURLOPT_DNS_SHUFFLE_ADDRESSES' => 'curl/curl_d.php', 'CURLOPT_DNS_USE_GLOBAL_CACHE' => 'curl/curl_d.php', 'CURLOPT_EGDSOCKET' => 'curl/curl_d.php', 'CURLOPT_ENCODING' => 'curl/curl_d.php', @@ -5402,6 +5433,8 @@ const CONSTANTS = array ( 'CURLOPT_FTP_USE_EPSV' => 'curl/curl_d.php', 'CURLOPT_FTP_USE_PRET' => 'curl/curl_d.php', 'CURLOPT_GSSAPI_DELEGATION' => 'curl/curl_d.php', + 'CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS' => 'curl/curl_d.php', + 'CURLOPT_HAPROXYPROTOCOL' => 'curl/curl_d.php', 'CURLOPT_HEADER' => 'curl/curl_d.php', 'CURLOPT_HEADERFUNCTION' => 'curl/curl_d.php', 'CURLOPT_HEADEROPT' => 'curl/curl_d.php', @@ -5483,6 +5516,7 @@ const CONSTANTS = array ( 'CURLOPT_PROXY_SSL_OPTIONS' => 'curl/curl_d.php', 'CURLOPT_PROXY_SSL_VERIFYHOST' => 'curl/curl_d.php', 'CURLOPT_PROXY_SSL_VERIFYPEER' => 'curl/curl_d.php', + 'CURLOPT_PROXY_TLS13_CIPHERS' => 'curl/curl_d.php', 'CURLOPT_PROXY_TLSAUTH_PASSWORD' => 'curl/curl_d.php', 'CURLOPT_PROXY_TLSAUTH_TYPE' => 'curl/curl_d.php', 'CURLOPT_PROXY_TLSAUTH_USERNAME' => 'curl/curl_d.php', @@ -5495,6 +5529,7 @@ const CONSTANTS = array ( 'CURLOPT_READFUNCTION' => 'curl/curl_d.php', 'CURLOPT_REDIR_PROTOCOLS' => 'curl/curl_d.php', 'CURLOPT_REFERER' => 'curl/curl_d.php', + 'CURLOPT_REQUEST_TARGET' => 'curl/curl_d.php', 'CURLOPT_RESOLVE' => 'curl/curl_d.php', 'CURLOPT_RESUME_FROM' => 'curl/curl_d.php', 'CURLOPT_RETURNTRANSFER' => 'curl/curl_d.php', @@ -5508,9 +5543,11 @@ const CONSTANTS = array ( 'CURLOPT_SASL_IR' => 'curl/curl_d.php', 'CURLOPT_SERVICE_NAME' => 'curl/curl_d.php', 'CURLOPT_SHARE' => 'curl/curl_d.php', + 'CURLOPT_SOCKS5_AUTH' => 'curl/curl_d.php', 'CURLOPT_SOCKS5_GSSAPI_NEC' => 'curl/curl_d.php', 'CURLOPT_SOCKS5_GSSAPI_SERVICE' => 'curl/curl_d.php', 'CURLOPT_SSH_AUTH_TYPES' => 'curl/curl_d.php', + 'CURLOPT_SSH_COMPRESSION' => 'curl/curl_d.php', 'CURLOPT_SSH_HOST_PUBLIC_KEY_MD5' => 'curl/curl_d.php', 'CURLOPT_SSH_KNOWNHOSTS' => 'curl/curl_d.php', 'CURLOPT_SSH_PRIVATE_KEYFILE' => 'curl/curl_d.php', @@ -5535,6 +5572,7 @@ const CONSTANTS = array ( 'CURLOPT_SSL_VERIFYSTATUS' => 'curl/curl_d.php', 'CURLOPT_STDERR' => 'curl/curl_d.php', 'CURLOPT_STREAM_WEIGHT' => 'curl/curl_d.php', + 'CURLOPT_SUPPRESS_CONNECT_HEADERS' => 'curl/curl_d.php', 'CURLOPT_TCP_FASTOPEN' => 'curl/curl_d.php', 'CURLOPT_TCP_KEEPALIVE' => 'curl/curl_d.php', 'CURLOPT_TCP_KEEPIDLE' => 'curl/curl_d.php', @@ -5547,6 +5585,8 @@ const CONSTANTS = array ( 'CURLOPT_TIMEOUT' => 'curl/curl_d.php', 'CURLOPT_TIMEOUT_MS' => 'curl/curl_d.php', 'CURLOPT_TIMEVALUE' => 'curl/curl_d.php', + 'CURLOPT_TIMEVALUE_LARGE' => 'curl/curl_d.php', + 'CURLOPT_TLS13_CIPHERS' => 'curl/curl_d.php', 'CURLOPT_TLSAUTH_PASSWORD' => 'curl/curl_d.php', 'CURLOPT_TLSAUTH_TYPE' => 'curl/curl_d.php', 'CURLOPT_TLSAUTH_USERNAME' => 'curl/curl_d.php', @@ -5616,6 +5656,7 @@ const CONSTANTS = array ( 'CURLSSH_AUTH_AGENT' => 'curl/curl_d.php', 'CURLSSH_AUTH_ANY' => 'curl/curl_d.php', 'CURLSSH_AUTH_DEFAULT' => 'curl/curl_d.php', + 'CURLSSH_AUTH_GSSAPI' => 'curl/curl_d.php', 'CURLSSH_AUTH_HOST' => 'curl/curl_d.php', 'CURLSSH_AUTH_KEYBOARD' => 'curl/curl_d.php', 'CURLSSH_AUTH_NONE' => 'curl/curl_d.php', @@ -5641,9 +5682,12 @@ const CONSTANTS = array ( 'CURL_IPRESOLVE_V4' => 'curl/curl_d.php', 'CURL_IPRESOLVE_V6' => 'curl/curl_d.php', 'CURL_IPRESOLVE_WHATEVER' => 'curl/curl_d.php', + 'CURL_LOCK_DATA_CONNECT' => 'curl/curl_d.php', 'CURL_LOCK_DATA_COOKIE' => 'curl/curl_d.php', 'CURL_LOCK_DATA_DNS' => 'curl/curl_d.php', + 'CURL_LOCK_DATA_PSL' => 'curl/curl_d.php', 'CURL_LOCK_DATA_SSL_SESSION' => 'curl/curl_d.php', + 'CURL_MAX_READ_SIZE' => 'curl/curl_d.php', 'CURL_NETRC_IGNORED' => 'curl/curl_d.php', 'CURL_NETRC_OPTIONAL' => 'curl/curl_d.php', 'CURL_NETRC_REQUIRED' => 'curl/curl_d.php', @@ -5666,6 +5710,12 @@ const CONSTANTS = array ( 'CURL_RTSPREQ_SET_PARAMETER' => 'curl/curl_d.php', 'CURL_RTSPREQ_TEARDOWN' => 'curl/curl_d.php', 'CURL_SSLVERSION_DEFAULT' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_DEFAULT' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_NONE' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_TLSv1_0' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_TLSv1_1' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_TLSv1_2' => 'curl/curl_d.php', + 'CURL_SSLVERSION_MAX_TLSv1_3' => 'curl/curl_d.php', 'CURL_SSLVERSION_SSLv2' => 'curl/curl_d.php', 'CURL_SSLVERSION_SSLv3' => 'curl/curl_d.php', 'CURL_SSLVERSION_TLSv1' => 'curl/curl_d.php', @@ -5679,6 +5729,7 @@ const CONSTANTS = array ( 'CURL_TIMECOND_NONE' => 'curl/curl_d.php', 'CURL_TLSAUTH_SRP' => 'curl/curl_d.php', 'CURL_VERSION_ASYNCHDNS' => 'curl/curl_d.php', + 'CURL_VERSION_BROTLI' => 'curl/curl_d.php', 'CURL_VERSION_CONV' => 'curl/curl_d.php', 'CURL_VERSION_CURLDEBUG' => 'curl/curl_d.php', 'CURL_VERSION_DEBUG' => 'curl/curl_d.php', @@ -5692,6 +5743,7 @@ const CONSTANTS = array ( 'CURL_VERSION_KERBEROS5' => 'curl/curl_d.php', 'CURL_VERSION_LARGEFILE' => 'curl/curl_d.php', 'CURL_VERSION_LIBZ' => 'curl/curl_d.php', + 'CURL_VERSION_MULTI_SSL' => 'curl/curl_d.php', 'CURL_VERSION_NTLM' => 'curl/curl_d.php', 'CURL_VERSION_NTLM_WB' => 'curl/curl_d.php', 'CURL_VERSION_PSL' => 'curl/curl_d.php', diff --git a/curl/curl_d.php b/curl/curl_d.php index cade1613..0e47bbc9 100644 --- a/curl/curl_d.php +++ b/curl/curl_d.php @@ -376,7 +376,7 @@ define ('CURL_VERSION_IPV6', 1); define ('CURL_VERSION_KERBEROS4', 2); define ('CURL_VERSION_SSL', 4); define ('CURL_VERSION_LIBZ', 8); -define ('CURLVERSION_NOW', 3); +define ('CURLVERSION_NOW', 4); define ('CURLE_OK', 0); define ('CURLE_UNSUPPORTED_PROTOCOL', 1); define ('CURLE_FAILED_INIT', 2); @@ -428,7 +428,7 @@ define ('CURLE_TOO_MANY_REDIRECTS', 47); define ('CURLE_UNKNOWN_TELNET_OPTION', 48); define ('CURLE_TELNET_OPTION_SYNTAX', 49); define ('CURLE_OBSOLETE', 50); -define ('CURLE_SSL_PEER_CERTIFICATE', 51); +define ('CURLE_SSL_PEER_CERTIFICATE', 60); define ('CURLE_GOT_NOTHING', 52); define ('CURLE_SSL_ENGINE_NOTFOUND', 53); define ('CURLE_SSL_ENGINE_SETFAILED', 54); @@ -845,6 +845,245 @@ define('CURL_PUSH_OK', 0); */ define('CURL_PUSH_DENY',1); +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_MAX_READ_SIZE', 524288); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_ABSTRACT_UNIX_SOCKET', 10264); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_DEFAULT', 65536); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_NONE', 0); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_TLSv1_0', 262144); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_TLSv1_1', 327680); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_TLSv1_2', 393216); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_SSLVERSION_MAX_TLSv1_3', 458752); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_SUPPRESS_CONNECT_HEADERS', 265); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLAUTH_GSSAPI', 4); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_CONTENT_LENGTH_DOWNLOAD_T', 6291471); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_CONTENT_LENGTH_UPLOAD_T', 6291472); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_SIZE_DOWNLOAD_T', 6291464); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_SIZE_UPLOAD_T', 6291463); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_SPEED_DOWNLOAD_T', 6291465); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_SPEED_UPLOAD_T', 6291466); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_REQUEST_TARGET', 10266); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_SOCKS5_AUTH', 267); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_SSH_COMPRESSION', 268); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_VERSION_MULTI_SSL', 4194304); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_VERSION_BROTLI', 8388608); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_LOCK_DATA_CONNECT', 5); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLSSH_AUTH_GSSAPI', 32); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_FILETIME_T', 6291470); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS', 271); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_TIMEVALUE_LARGE', 30270); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_DNS_SHUFFLE_ADDRESSES', 275); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_HAPROXYPROTOCOL', 274); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURL_LOCK_DATA_PSL', 6); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLAUTH_BEARER', 64); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_APPCONNECT_TIME_T', 6291512); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_CONNECT_TIME_T', 6291508); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_NAMELOOKUP_TIME_T', 6291507); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_PRETRANSFER_TIME_T', 6291509); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_REDIRECT_TIME_T', 6291511); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_STARTTRANSFER_TIME_T', 6291510); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLINFO_TOTAL_TIME_T', 6291506); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_DISALLOW_USERNAME_IN_URL', 278); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_PROXY_TLS13_CIPHERS', 10277); + +/** + * @link https://php.net/manual/en/curl.constants.php + * @since 7.3 + */ +define('CURLOPT_TLS13_CIPHERS', 10276); /** * @since 5.5 diff --git a/sodium/sodium.php b/sodium/sodium.php index 25930bd6..3665a4a0 100644 --- a/sodium/sodium.php +++ b/sodium/sodium.php @@ -67,15 +67,15 @@ const SODIUM_CRYPTO_SIGN_SECRETKEYBYTES = 64; const SODIUM_CRYPTO_SIGN_KEYPAIRBYTES = 96; const SODIUM_CRYPTO_STREAM_KEYBYTES = 32; const SODIUM_CRYPTO_STREAM_NONCEBYTES = 24; -const SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE = 4; -const SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE = 33554432; -const SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE = 6; -const SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE = 134217728; -const SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE = 8; -const SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE = 536870912; -const SODIUM_LIBRARY_VERSION="1.0.11"; -const SODIUM_LIBRARY_MAJOR_VERSION = 9; -const SODIUM_LIBRARY_MINOR_VERSION = 3; +const SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE = 2; +const SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE = 67108864; +const SODIUM_CRYPTO_PWHASH_OPSLIMIT_MODERATE = 3; +const SODIUM_CRYPTO_PWHASH_MEMLIMIT_MODERATE = 268435456; +const SODIUM_CRYPTO_PWHASH_OPSLIMIT_SENSITIVE = 4; +const SODIUM_CRYPTO_PWHASH_MEMLIMIT_SENSITIVE = 1073741824; +const SODIUM_LIBRARY_VERSION="1.0.17"; +const SODIUM_LIBRARY_MAJOR_VERSION = 10; +const SODIUM_LIBRARY_MINOR_VERSION = 2; const SODIUM_CRYPTO_KDF_BYTES_MIN = 16; const SODIUM_CRYPTO_KDF_BYTES_MAX = 64; const SODIUM_CRYPTO_KDF_CONTEXTBYTES = 8; @@ -84,9 +84,9 @@ const SODIUM_CRYPTO_KX_SEEDBYTES = 32; const SODIUM_CRYPTO_KX_SESSIONKEYBYTES = 32; const SODIUM_CRYPTO_KX_KEYPAIRBYTES = 64; const SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13 = 1; -const SODIUM_CRYPTO_PWHASH_ALG_DEFAULT = 1; +const SODIUM_CRYPTO_PWHASH_ALG_DEFAULT = 2; const SODIUM_CRYPTO_PWHASH_SALTBYTES = 16; -const SODIUM_CRYPTO_PWHASH_STRPREFIX = '$argon2i$'; +const SODIUM_CRYPTO_PWHASH_STRPREFIX = '$argon2id$'; /** * Can you access AES-256-GCM? This is only available if you have supported @@ -1206,6 +1206,82 @@ function sodium_crypto_aead_chacha20poly1305_keygen(): string {} */ function sodium_crypto_aead_chacha20poly1305_ietf_keygen(): string {} +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-aead-xchacha20poly1305-ietf-decrypt.php + */ +function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt(string $ciphertext,string $ad,string $nonce,string $key): string {} + +/** + * @since 7.2.0 + * https://www.php.net/manual/en/function.sodium-crypto-aead-xchacha20poly1305-ietf-encrypt.php + */ +function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt(string $msg, string $ad, string $nonce, string $key): string{} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-aead-xchacha20poly1305-ietf-keygen.php + */ +function sodium_crypto_aead_xchacha20poly1305_ietf_keygen():string {} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-pwhash-str-needs-rehash.php + */ +function sodium_crypto_pwhash_str_needs_rehash(string $password, int $opslimit, int $memlimit): bool{} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-keygen.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_keygen(): string {} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-init-push.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_init_push(string $key): array{} + +/** + * @param string $state + * @param string $msg + * @param string $ad [optional] + * @param int $tag [optional] + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-push.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_push(string &$state, string $msg, string $ad, int $tag): string{} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-init-pull.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_init_pull($header, $key): string{} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-pull.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_pull(string &$state, string $c, string $ad = ''): array {} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-crypto-secretstream-xchacha20poly1305-rekey.php + */ +function sodium_crypto_secretstream_xchacha20poly1305_rekey(string &$state): void{} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-bin2base64.php + */ +function sodium_bin2base64(string $bin, int $id): string {} + +/** + * @since 7.2.0 + * @see https://www.php.net/manual/en/function.sodium-base642bin.php + */ +function sodium_base642bin(string $b64, int $id, string $ignore = ''){} + class SodiumException extends Exception { }