Skip to content

Commit c637781

Browse files
kocsismatekocsismate
committed
Address code review comments
1 parent ada4ebc commit c637781

26 files changed

+349
-353
lines changed

‎ext/openssl/openssl.c

Lines changed: 194 additions & 198 deletions
Large diffs are not rendered by default.

‎ext/openssl/openssl.stub.php

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,185 +2,185 @@
22

33
/** @generate-function-entries */
44

5-
final class X509Certificate
5+
final class OpenSSLCertificate
66
{
77
}
88

9-
final class X509CertificateSigningRequest
9+
final class OpenSSLCertificateSigningRequest
1010
{
1111
}
1212

13-
final class OpenSSLKey
13+
final class OpenSSLAsymmetricKey
1414
{
1515
}
1616

17-
function openssl_x509_export_to_file(X509Certificate|string $x509, string $outfilename, bool $notext = true): bool {}
17+
function openssl_x509_export_to_file(OpenSSLCertificate|string $x509, string $outfilename, bool $notext = true): bool {}
1818

19-
function openssl_x509_export(X509Certificate|string $x509, &$out, bool $notext = true): bool {}
19+
function openssl_x509_export(OpenSSLCertificate|string $x509, &$out, bool $notext = true): bool {}
2020

21-
function openssl_x509_fingerprint(X509Certificate|string $x509, string $method = "sha1", bool $raw_output = false): string|false {}
21+
function openssl_x509_fingerprint(OpenSSLCertificate|string $x509, string $method = "sha1", bool $raw_output = false): string|false {}
2222

23-
/** @param OpenSSLKey|X509Certificate|string|array $key */
24-
function openssl_x509_check_private_key(X509Certificate|string $x509, $key): bool {}
23+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key */
24+
function openssl_x509_check_private_key(OpenSSLCertificate|string $x509, $key): bool {}
2525

26-
/** @param OpenSSLKey|X509Certificate|string|array $key */
27-
function openssl_x509_verify(X509Certificate|string $x509, $key): int {}
26+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key */
27+
function openssl_x509_verify(OpenSSLCertificate|string $x509, $key): int {}
2828

29-
function openssl_x509_parse(X509Certificate|string $x509, bool $shortname = true): array|false {}
29+
function openssl_x509_parse(OpenSSLCertificate|string $x509, bool $shortname = true): array|false {}
3030

31-
function openssl_x509_checkpurpose(X509Certificate|string $x509, int $purpose, ?array $cainfo = [], ?string $untrustedfile = null): bool|int {}
31+
function openssl_x509_checkpurpose(OpenSSLCertificate|string $x509, int $purpose, ?array $cainfo = [], ?string $untrustedfile = null): bool|int {}
3232

33-
function openssl_x509_read(X509Certificate|string $x509): X509Certificate|false {}
33+
function openssl_x509_read(OpenSSLCertificate|string $x509): OpenSSLCertificate|false {}
3434

3535
/** @deprecated */
36-
function openssl_x509_free(X509Certificate $x509): void {}
36+
function openssl_x509_free(OpenSSLCertificate $x509): void {}
3737

38-
/** @param OpenSSLKey|X509Certificate|string|array $priv_key */
39-
function openssl_pkcs12_export_to_file(X509Certificate|string $x509cert, string $filename, $priv_key, string $pass, array $args = []): bool {}
38+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $priv_key */
39+
function openssl_pkcs12_export_to_file(OpenSSLCertificate|string $x509cert, string $filename, $priv_key, string $pass, array $args = []): bool {}
4040

41-
/** @param OpenSSLKey|X509Certificate|string|array $priv_key */
42-
function openssl_pkcs12_export(X509Certificate|string $x509, &$out, $priv_key, string $pass, array $args = []): bool {}
41+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $priv_key */
42+
function openssl_pkcs12_export(OpenSSLCertificate|string $x509, &$out, $priv_key, string $pass, array $args = []): bool {}
4343

4444
/** @param array $certs */
4545
function openssl_pkcs12_read(string $pkcs12, &$certs, string $pass): bool {}
4646

47-
function openssl_csr_export_to_file(X509CertificateSigningRequest|string $csr, string $outfilename, bool $notext = true): bool {}
47+
function openssl_csr_export_to_file(OpenSSLCertificateSigningRequest|string $csr, string $outfilename, bool $notext = true): bool {}
4848

49-
/** @param OpenSSLKey $out */
50-
function openssl_csr_export(X509CertificateSigningRequest|string $csr, &$out, bool $notext = true): bool {}
49+
/** @param OpenSSLAsymmetricKey $out */
50+
function openssl_csr_export(OpenSSLCertificateSigningRequest|string $csr, &$out, bool $notext = true): bool {}
5151

52-
/** @param OpenSSLKey|X509Certificate|string|array $priv_key */
53-
function openssl_csr_sign(X509CertificateSigningRequest|string $csr, X509Certificate|string|null $cacert, $priv_key, int $days, ?array $config_args = null, int $serial = 0): X509Certificate|false {}
52+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $priv_key */
53+
function openssl_csr_sign(OpenSSLCertificateSigningRequest|string $csr, OpenSSLCertificate|string|null $cacert, $priv_key, int $days, ?array $config_args = null, int $serial = 0): OpenSSLCertificate|false {}
5454

55-
/** @param OpenSSLKey $privkey */
56-
function openssl_csr_new(array $dn, &$privkey, ?array $configargs = null, ?array $extraattribs = null): X509CertificateSigningRequest|false {}
55+
/** @param OpenSSLAsymmetricKey $privkey */
56+
function openssl_csr_new(array $dn, &$privkey, ?array $configargs = null, ?array $extraattribs = null): OpenSSLCertificateSigningRequest|false {}
5757

58-
function openssl_csr_get_subject(X509CertificateSigningRequest|string $csr, bool $use_shortnames = true): array|false {}
58+
function openssl_csr_get_subject(OpenSSLCertificateSigningRequest|string $csr, bool $use_shortnames = true): array|false {}
5959

60-
function openssl_csr_get_public_key(X509CertificateSigningRequest|string $csr, bool $use_shortnames = true): OpenSSLKey|false {}
60+
function openssl_csr_get_public_key(OpenSSLCertificateSigningRequest|string $csr, bool $use_shortnames = true): OpenSSLAsymmetricKey|false {}
6161

62-
function openssl_pkey_new(?array $configargs = null): OpenSSLKey|false {}
62+
function openssl_pkey_new(?array $configargs = null): OpenSSLAsymmetricKey|false {}
6363

6464
/**
65-
* @param OpenSSLKey|X509Certificate|string|array $key
65+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
6666
* @param string $out
6767
*/
6868
function openssl_pkey_export_to_file($key, string $outfilename, ?string $passphrase = null, ?array $configargs = null): bool {}
6969

7070
/**
71-
* @param OpenSSLKey|X509Certificate|string|array $key
71+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
7272
* @param string $out
7373
*/
7474
function openssl_pkey_export($key, &$out, ?string $passphrase = null, ?array $configargs = null): bool {}
7575

76-
/** @param OpenSSLKey|X509Certificate|string|array $cert */
77-
function openssl_pkey_get_public($cert): OpenSSLKey|false {}
76+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $cert */
77+
function openssl_pkey_get_public($cert): OpenSSLAsymmetricKey|false {}
7878

7979
/**
80-
* @param OpenSSLKey|X509Certificate|string|array $cert
80+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $cert
8181
* @alias openssl_pkey_get_public
8282
*/
83-
function openssl_get_publickey($cert): OpenSSLKey|false {}
83+
function openssl_get_publickey($cert): OpenSSLAsymmetricKey|false {}
8484

8585
/** @deprecated */
86-
function openssl_pkey_free(OpenSSLKey $key): void {}
86+
function openssl_pkey_free(OpenSSLAsymmetricKey $key): void {}
8787

8888
/**
8989
* @alias openssl_pkey_free
9090
* @deprecated
9191
*/
92-
function openssl_free_key(OpenSSLKey $key): void {}
92+
function openssl_free_key(OpenSSLAsymmetricKey $key): void {}
9393

94-
/** @param OpenSSLKey|X509Certificate|string|array $key */
95-
function openssl_pkey_get_private($key, string $passphrase = UNKNOWN): OpenSSLKey|false {}
94+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key */
95+
function openssl_pkey_get_private($key, string $passphrase = UNKNOWN): OpenSSLAsymmetricKey|false {}
9696

9797
/**
98-
* @param OpenSSLKey|X509Certificate|string|array $key
98+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
9999
* @alias openssl_pkey_get_private
100100
*/
101-
function openssl_get_privatekey($key, string $passphrase = UNKNOWN): OpenSSLKey|false {}
101+
function openssl_get_privatekey($key, string $passphrase = UNKNOWN): OpenSSLAsymmetricKey|false {}
102102

103-
function openssl_pkey_get_details(OpenSSLKey $key): array|false {}
103+
function openssl_pkey_get_details(OpenSSLAsymmetricKey $key): array|false {}
104104

105105
function openssl_pbkdf2(string $password, string $salt, int $key_length, int $iterations, string $digest_algorithm = 'sha1'): string|false {}
106106

107107
function openssl_pkcs7_verify(string $filename, int $flags, string $signerscerts = UNKNOWN, array $cainfo = UNKNOWN, string $extracerts = UNKNOWN, string $content = UNKNOWN, string $pk7 = UNKNOWN): bool|int {}
108108

109-
/** @param X509Certificate|string|array $recipcerts */
109+
/** @param OpenSSLCertificate|string|array $recipcerts */
110110
function openssl_pkcs7_encrypt(string $infile, string $outfile, $recipcerts, ?array $headers, int $flags = 0, int $cipher = OPENSSL_CIPHER_RC2_40): bool {}
111111

112-
/** @param OpenSSLKey|X509Certificate|string|array $signkey */
113-
function openssl_pkcs7_sign(string $infile, string $outfile, X509Certificate|string $signcert, $signkey, ?array $headers, int $flags = PKCS7_DETACHED, ?string $extracertsfilename = null): bool {}
112+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $signkey */
113+
function openssl_pkcs7_sign(string $infile, string $outfile, OpenSSLCertificate|string $signcert, $signkey, ?array $headers, int $flags = PKCS7_DETACHED, ?string $extracertsfilename = null): bool {}
114114

115-
/** @param OpenSSLKey|X509Certificate|string|array|null $recipkey */
116-
function openssl_pkcs7_decrypt(string $infilename, string $outfilename, X509Certificate|string $recipcert, $recipkey = null): bool {}
115+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array|null $recipkey */
116+
function openssl_pkcs7_decrypt(string $infilename, string $outfilename, OpenSSLCertificate|string $recipcert, $recipkey = null): bool {}
117117

118118
function openssl_pkcs7_read(string $infilename, &$certs): bool {}
119119

120120
function openssl_cms_verify(string $filename, int $flags = 0, ?string $signerscerts = null, ?array $cainfo = null, ?string $extracerts = null, ?string $content = null, ?string $pk7 = null, ?string $sigfile = null, $encoding = OPENSSL_ENCODING_SMIME): bool {}
121121

122-
/** @param X509Certificate|string|array $recipcerts */
122+
/** @param OpenSSLCertificate|string|array $recipcerts */
123123
function openssl_cms_encrypt(string $infile, string $outfile, $recipcerts, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, int $cipher = OPENSSL_CIPHER_RC2_40): bool {}
124124

125-
/** @param OpenSSLKey|X509Certificate|string|array $signkey */
126-
function openssl_cms_sign(string $infile, string $outfile, X509Certificate|string $signcert, $signkey, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, ?string $extracertsfilename = null): bool {}
125+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $signkey */
126+
function openssl_cms_sign(string $infile, string $outfile, OpenSSLCertificate|string $signcert, $signkey, ?array $headers, int $flags = 0, int $encoding = OPENSSL_ENCODING_SMIME, ?string $extracertsfilename = null): bool {}
127127

128-
/** @param OpenSSLKey|X509Certificate|string|array $recipkey */
129-
function openssl_cms_decrypt(string $infilename, string $outfilename, X509Certificate|string $recipcert, $recipkey, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
128+
/** @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $recipkey */
129+
function openssl_cms_decrypt(string $infilename, string $outfilename, OpenSSLCertificate|string $recipcert, $recipkey, int $encoding = OPENSSL_ENCODING_SMIME): bool {}
130130

131131
/** @param array $certs */
132132
function openssl_cms_read(string $infilename, &$certs): bool {}
133133

134134
/**
135135
* @param string $crypted
136-
* @param OpenSSLKey|X509Certificate|string|array $key
136+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
137137
*/
138138
function openssl_private_encrypt(string $data, &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
139139

140140
/**
141141
* @param string $crypted
142-
* @param OpenSSLKey|X509Certificate|string|array $key
142+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
143143
*/
144144
function openssl_private_decrypt(string $data, &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
145145

146146
/**
147147
* @param string $crypted
148-
* @param OpenSSLKey|X509Certificate|string|array $key
148+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
149149
*/
150150
function openssl_public_encrypt(string $data, &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
151151

152152
/**
153153
* @param string $crypted
154-
* @param OpenSSLKey|X509Certificate|string|array $key
154+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
155155
*/
156156
function openssl_public_decrypt(string $data, &$crypted, $key, int $padding = OPENSSL_PKCS1_PADDING): bool {}
157157

158158
function openssl_error_string(): string|false {}
159159

160160
/**
161161
* @param string $signature
162-
* @param OpenSSLKey|X509Certificate|string|array $key
162+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
163163
* @param int|string $method
164164
*/
165165
function openssl_sign(string $data, &$signature, $key, $method = OPENSSL_ALGO_SHA1): bool {}
166166

167167
/**
168-
* @param OpenSSLKey|X509Certificate|string|array $key
168+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $key
169169
* @param int|string $method
170170
*/
171171
function openssl_verify(string $data, string $signature, $key, $method = OPENSSL_ALGO_SHA1): int|false {}
172172

173173
/**
174174
* @param string $sealdata
175175
* @param array $ekeys
176-
* @param OpenSSLKey|X509Certificate|string|array $pubkeys
176+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $pubkeys
177177
* @param string $iv
178178
*/
179179
function openssl_seal(string $data, &$sealdata, &$ekeys, array $pubkeys, string $method = UNKNOWN, &$iv = UNKNOWN): int|false {}
180180

181181
/**
182182
* @param string $opendata
183-
* @param OpenSSLKey|X509Certificate|string|array $privkey
183+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $privkey
184184
*/
185185
function openssl_open(string $data, &$opendata, string $ekey, $privkey, string $method = UNKNOWN, string $iv = UNKNOWN): bool {}
186186

@@ -201,18 +201,18 @@ function openssl_decrypt(string $data, string $method, string $password, int $op
201201

202202
function openssl_cipher_iv_length(string $method): int|false {}
203203

204-
function openssl_dh_compute_key(string $pub_key, OpenSSLKey $dh_key): string|false {}
204+
function openssl_dh_compute_key(string $pub_key, OpenSSLAsymmetricKey $dh_key): string|false {}
205205

206206
/**
207-
* @param OpenSSLKey|X509Certificate|string|array $peer_pub_key
208-
* @param OpenSSLKey|X509Certificate|string|array $priv_key
207+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $peer_pub_key
208+
* @param OpenSSLAsymmetricKey|OpenSSLCertificate|string|array $priv_key
209209
*/
210210
function openssl_pkey_derive($peer_pub_key, $priv_key, int $keylen = 0): string|false {}
211211

212212
/** @param bool $result_is_strong */
213213
function openssl_random_pseudo_bytes(int $length, &$result_is_strong = UNKNOWN): string {}
214214

215-
function openssl_spki_new(OpenSSLKey $privkey, string $challenge, int $algo = OPENSSL_ALGO_MD5): string|false {}
215+
function openssl_spki_new(OpenSSLAsymmetricKey $privkey, string $challenge, int $algo = OPENSSL_ALGO_MD5): string|false {}
216216

217217
function openssl_spki_verify(string $spki): bool {}
218218

0 commit comments

Comments
 (0)