diff options
Diffstat (limited to 'ext/openssl')
31 files changed, 140 insertions, 140 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index a132a63678..e0e10973be 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -626,24 +626,24 @@ static time_t php_openssl_asn1_time_to_time_t(ASN1_UTCTIME * timestr) /* {{{ */ size_t timestr_len; if (ASN1_STRING_type(timestr) != V_ASN1_UTCTIME && ASN1_STRING_type(timestr) != V_ASN1_GENERALIZEDTIME) { - php_error_docref(NULL, E_WARNING, "illegal ASN1 data type for timestamp"); + php_error_docref(NULL, E_WARNING, "Illegal ASN1 data type for timestamp"); return (time_t)-1; } timestr_len = (size_t)ASN1_STRING_length(timestr); if (timestr_len != strlen((const char *)ASN1_STRING_get0_data(timestr))) { - php_error_docref(NULL, E_WARNING, "illegal length in timestamp"); + php_error_docref(NULL, E_WARNING, "Illegal length in timestamp"); return (time_t)-1; } if (timestr_len < 13 && timestr_len != 11) { - php_error_docref(NULL, E_WARNING, "unable to parse time string %s correctly", timestr->data); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", timestr->data); return (time_t)-1; } if (ASN1_STRING_type(timestr) == V_ASN1_GENERALIZEDTIME && timestr_len < 15) { - php_error_docref(NULL, E_WARNING, "unable to parse time string %s correctly", timestr->data); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", timestr->data); return (time_t)-1; } @@ -741,7 +741,7 @@ static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */ sktmp = CONF_get_section(req->req_config, str); if (sktmp == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "problem loading oid section %s", str); + php_error_docref(NULL, E_WARNING, "Problem loading oid section %s", str); return FAILURE; } for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) { @@ -749,7 +749,7 @@ static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */ if (OBJ_sn2nid(cnf->name) == NID_undef && OBJ_ln2nid(cnf->name) == NID_undef && OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "problem creating object %s=%s", cnf->name, cnf->value); + php_error_docref(NULL, E_WARNING, "Problem creating object %s=%s", cnf->name, cnf->value); return FAILURE; } } @@ -974,7 +974,7 @@ static int php_openssl_load_rand_file(const char * file, int *egdsocket, int *se if (file == NULL || !RAND_load_file(file, -1)) { if (RAND_status() == 0) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "unable to load random state; not enough random data!"); + php_error_docref(NULL, E_WARNING, "Unable to load random state; not enough random data!"); return FAILURE; } return FAILURE; @@ -1000,7 +1000,7 @@ static int php_openssl_write_rand_file(const char * file, int egdsocket, int see PHP_OPENSSL_RAND_ADD_TIME(); if (file == NULL || !RAND_write_file(file)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "unable to write random state"); + php_error_docref(NULL, E_WARNING, "Unable to write random state"); return FAILURE; } return SUCCESS; @@ -1463,7 +1463,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } @@ -1483,7 +1483,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) RETVAL_TRUE; } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } if (Z_TYPE_P(zcert) != IS_RESOURCE) { X509_free(cert); @@ -1783,7 +1783,7 @@ PHP_FUNCTION(openssl_x509_export) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } @@ -1857,7 +1857,7 @@ PHP_FUNCTION(openssl_x509_fingerprint) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); RETURN_FALSE; } @@ -2189,7 +2189,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) if(!(stack = sk_X509_new_null())) { php_openssl_store_errors(); - php_error_docref(NULL, E_ERROR, "memory allocation failure"); + php_error_docref(NULL, E_ERROR, "Memory allocation failure"); goto end; } @@ -2200,7 +2200,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) if (!(in=BIO_new_file(certfile, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY)))) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening the file, %s", certfile); + php_error_docref(NULL, E_WARNING, "Error opening the file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2208,7 +2208,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) /* This loads from a file, a stack of x509/crl/pkey sets */ if (!(sk=PEM_X509_INFO_read_bio(in, NULL, NULL, NULL))) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error reading the file, %s", certfile); + php_error_docref(NULL, E_WARNING, "Error reading the file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2223,7 +2223,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) X509_INFO_free(xi); } if (!sk_X509_num(stack)) { - php_error_docref(NULL, E_WARNING, "no certificates in file, %s", certfile); + php_error_docref(NULL, E_WARNING, "No certificates in file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2245,12 +2245,12 @@ static int check_cert(X509_STORE *ctx, X509 *x, STACK_OF(X509) *untrustedchain, csc = X509_STORE_CTX_new(); if (csc == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_ERROR, "memory allocation failure"); + php_error_docref(NULL, E_ERROR, "Memory allocation failure"); return 0; } if (!X509_STORE_CTX_init(csc, ctx, x, untrustedchain)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "cert store initialization failed"); + php_error_docref(NULL, E_WARNING, "Certificate store initialization failed"); return 0; } if (purpose >= 0 && !X509_STORE_CTX_set_purpose(csc, purpose)) { @@ -2347,7 +2347,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) } if (VCWD_STAT(ZSTR_VAL(str), &sb) == -1) { - php_error_docref(NULL, E_WARNING, "unable to stat %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Unable to stat %s", ZSTR_VAL(str)); zend_string_release(str); continue; } @@ -2356,7 +2356,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) file_lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); if (file_lookup == NULL || !X509_LOOKUP_load_file(file_lookup, ZSTR_VAL(str), X509_FILETYPE_PEM)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error loading file %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Error loading file %s", ZSTR_VAL(str)); } else { nfiles++; } @@ -2365,7 +2365,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) dir_lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir()); if (dir_lookup == NULL || !X509_LOOKUP_add_dir(dir_lookup, ZSTR_VAL(str), X509_FILETYPE_PEM)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error loading directory %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Error loading directory %s", ZSTR_VAL(str)); } else { ndirs++; } @@ -2405,7 +2405,7 @@ PHP_FUNCTION(openssl_x509_read) ZVAL_RES(return_value, res); if (x509 == NULL) { - php_error_docref(NULL, E_WARNING, "supplied parameter cannot be coerced into an X509 certificate!"); + php_error_docref(NULL, E_WARNING, "Supplied parameter cannot be coerced into an X509 certificate!"); RETURN_FALSE; } } @@ -2518,19 +2518,19 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (!X509_check_private_key(cert, priv_key)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "private key does not correspond to cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to cert"); goto cleanup; } if (php_openssl_open_base_dir_chk(filename)) { @@ -2568,7 +2568,7 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file) RETVAL_TRUE; } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } PKCS12_free(p12); @@ -2614,18 +2614,18 @@ PHP_FUNCTION(openssl_pkcs12_export) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (!X509_check_private_key(cert, priv_key)) { - php_error_docref(NULL, E_WARNING, "private key does not correspond to cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to cert"); goto cleanup; } @@ -2897,7 +2897,7 @@ static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, z return FAILURE; } if (!X509_NAME_entry_count(subj)) { - php_error_docref(NULL, E_WARNING, "no objects specified in config file"); + php_error_docref(NULL, E_WARNING, "No objects specified in config file"); return FAILURE; } } @@ -3033,7 +3033,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } @@ -3048,7 +3048,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) php_openssl_store_errors(); } if (!PEM_write_bio_X509_REQ(bio_out, csr)) { - php_error_docref(NULL, E_WARNING, "error writing PEM to file %s", filename); + php_error_docref(NULL, E_WARNING, "Error writing PEM to file %s", filename); php_openssl_store_errors(); } else { RETVAL_TRUE; @@ -3056,7 +3056,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) BIO_free(bio_out); } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } if (csr_resource == NULL && csr != NULL) { @@ -3084,7 +3084,7 @@ PHP_FUNCTION(openssl_csr_export) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } @@ -3138,27 +3138,27 @@ PHP_FUNCTION(openssl_csr_sign) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } if (zcert) { cert = php_openssl_x509_from_zval(zcert, 0, &certresource); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 2"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 2"); goto cleanup; } } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (cert && !X509_check_private_key(cert, priv_key)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "private key does not correspond to signing cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to signing cert"); goto cleanup; } @@ -3169,7 +3169,7 @@ PHP_FUNCTION(openssl_csr_sign) key = X509_REQ_get_pubkey(csr); if (key == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error unpacking public key"); + php_error_docref(NULL, E_WARNING, "Error unpacking public key"); goto cleanup; } i = X509_REQ_verify(csr, key); @@ -3230,7 +3230,7 @@ PHP_FUNCTION(openssl_csr_sign) /* Now sign it */ if (!X509_sign(new_cert, priv_key, req.digest)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "failed to sign it"); + php_error_docref(NULL, E_WARNING, "Failed to sign it"); goto cleanup; } @@ -3502,7 +3502,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* get passphrase */ if ((zphrase = zend_hash_index_find(Z_ARRVAL_P(val), 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "key array must be of the form array(0 => key, 1 => phrase)"); + php_error_docref(NULL, E_WARNING, "Key array must be of the form array(0 => key, 1 => phrase)"); return NULL; } @@ -3521,7 +3521,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* now set val to be the key param and continue */ if ((val = zend_hash_index_find(Z_ARRVAL_P(val), 0)) == NULL) { - php_error_docref(NULL, E_WARNING, "key array must be of the form array(0 => key, 1 => phrase)"); + php_error_docref(NULL, E_WARNING, "Key array must be of the form array(0 => key, 1 => phrase)"); TMP_CLEAN; } } @@ -3549,7 +3549,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* check whether it is actually a private key if requested */ if (!public_key && !is_priv) { - php_error_docref(NULL, E_WARNING, "supplied key param is a public key"); + php_error_docref(NULL, E_WARNING, "Supplied key param is a public key"); TMP_CLEAN; } @@ -3663,7 +3663,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req EVP_PKEY * return_val = NULL; if (req->priv_key_bits < MIN_KEY_LENGTH) { - php_error_docref(NULL, E_WARNING, "private key length is too short; it needs to be at least %d bits, not %d", + php_error_docref(NULL, E_WARNING, "Private key length is too short; it needs to be at least %d bits, not %d", MIN_KEY_LENGTH, req->priv_key_bits); return NULL; } @@ -3688,7 +3688,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req BIGNUM *bne = (BIGNUM *)BN_new(); if (BN_set_word(bne, RSA_F4) != 1) { BN_free(bne); - php_error_docref(NULL, E_WARNING, "failed setting exponent"); + php_error_docref(NULL, E_WARNING, "Failed setting exponent"); return NULL; } rsaparam = RSA_new(); @@ -3865,7 +3865,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey) break; #endif default: - php_error_docref(NULL, E_WARNING, "key type not supported in this PHP build!"); + php_error_docref(NULL, E_WARNING, "Key type not supported in this PHP build!"); break; } return 1; @@ -4282,7 +4282,7 @@ PHP_FUNCTION(openssl_pkey_export_to_file) if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get key from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get key from parameter 1"); } RETURN_FALSE; } @@ -4369,7 +4369,7 @@ PHP_FUNCTION(openssl_pkey_export) if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get key from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get key from parameter 1"); } RETURN_FALSE; } @@ -4931,7 +4931,7 @@ PHP_FUNCTION(openssl_pkcs7_verify) if (!PEM_write_bio_X509(certout, sk_X509_value(signers, i))) { php_openssl_store_errors(); RETVAL_LONG(-1); - php_error_docref(NULL, E_WARNING, "failed to write signer %d", i); + php_error_docref(NULL, E_WARNING, "Failed to write signer %d", i); } } @@ -4944,7 +4944,7 @@ PHP_FUNCTION(openssl_pkcs7_verify) BIO_free(certout); } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "signature OK, but cannot open %s for writing", signersfilename); + php_error_docref(NULL, E_WARNING, "Signature OK, but cannot open %s for writing", signersfilename); RETVAL_LONG(-1); } @@ -5251,14 +5251,14 @@ PHP_FUNCTION(openssl_pkcs7_sign) privkey = php_openssl_evp_from_zval(zprivkey, 0, "", 0, 0, &keyresource); if (privkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "error getting private key"); + php_error_docref(NULL, E_WARNING, "Error getting private key"); } goto clean_exit; } cert = php_openssl_x509_from_zval(zcert, 0, &certresource); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "error getting cert"); + php_error_docref(NULL, E_WARNING, "Error getting cert"); goto clean_exit; } @@ -5269,21 +5269,21 @@ PHP_FUNCTION(openssl_pkcs7_sign) infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening input file %s!", infilename); + php_error_docref(NULL, E_WARNING, "Error opening input file %s!", infilename); goto clean_exit; } outfile = BIO_new_file(outfilename, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY)); if (outfile == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening output file %s!", outfilename); + php_error_docref(NULL, E_WARNING, "Error opening output file %s!", outfilename); goto clean_exit; } p7 = PKCS7_sign(cert, privkey, others, infile, (int)flags); if (p7 == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error creating PKCS7 structure!"); + php_error_docref(NULL, E_WARNING, "Error creating PKCS7 structure!"); goto clean_exit; } @@ -5358,14 +5358,14 @@ PHP_FUNCTION(openssl_pkcs7_decrypt) cert = php_openssl_x509_from_zval(recipcert, 0, &certresval); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "unable to coerce parameter 3 to x509 cert"); + php_error_docref(NULL, E_WARNING, "Unable to coerce parameter 3 to x509 cert"); goto clean_exit; } key = php_openssl_evp_from_zval(recipkey ? recipkey : recipcert, 0, "", 0, 0, &keyresval); if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "unable to get private key"); + php_error_docref(NULL, E_WARNING, "Unable to get private key"); } goto clean_exit; } @@ -5733,7 +5733,7 @@ PHP_FUNCTION(openssl_sign) pkey = php_openssl_evp_from_zval(key, 0, "", 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "supplied key param cannot be coerced into a private key"); + php_error_docref(NULL, E_WARNING, "Supplied key param cannot be coerced into a private key"); } RETURN_FALSE; } @@ -5820,7 +5820,7 @@ PHP_FUNCTION(openssl_verify) pkey = php_openssl_evp_from_zval(key, 1, NULL, 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "supplied key param cannot be coerced into a public key"); + php_error_docref(NULL, E_WARNING, "Supplied key param cannot be coerced into a public key"); } RETURN_FALSE; } @@ -5902,7 +5902,7 @@ PHP_FUNCTION(openssl_seal) pkeys[i] = php_openssl_evp_from_zval(pubkey, 1, NULL, 0, 0, &key_resources[i]); if (pkeys[i] == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "not a public key (%dth member of pubkeys)", i+1); + php_error_docref(NULL, E_WARNING, "Not a public key (%dth member of pubkeys)", i+1); } RETVAL_FALSE; goto clean_exit; @@ -6002,7 +6002,7 @@ PHP_FUNCTION(openssl_open) pkey = php_openssl_evp_from_zval(privkey, 0, "", 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "unable to coerce parameter 4 into a private key"); + php_error_docref(NULL, E_WARNING, "Unable to coerce parameter 4 into a private key"); } RETURN_FALSE; } diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 03f9f29a03..d0e5d542cd 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -25,11 +25,11 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index fdd75680a3..9f559453e7 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -60,5 +60,5 @@ Warning: stream_socket_client(): Peer certificate CN=`bug54992_actual_peer_name' Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug65538_002.phpt b/ext/openssl/tests/bug65538_002.phpt index 2a06d2d1b6..51d8f46f5b 100644 --- a/ext/openssl/tests/bug65538_002.phpt +++ b/ext/openssl/tests/bug65538_002.phpt @@ -22,4 +22,4 @@ Warning: remote cafile streams are disabled for security purposes in %s on line Warning: file_get_contents(): Failed to enable crypto in %s on line %d -Warning: file_get_contents(%s): failed to open stream: operation failed in %s on line %d +Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index cffba43dfe..7a516d0be6 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -49,7 +49,7 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index 34e07a4532..3419c06bed 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -54,14 +54,14 @@ Warning: stream_socket_client(): Expected peer fingerprint must be a string or a Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Expected peer fingerprint must be a string or an array in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -70,7 +70,7 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -79,5 +79,5 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt index 5df8ac27c6..6d4ca66580 100644 --- a/ext/openssl/tests/bug71475.phpt +++ b/ext/openssl/tests/bug71475.phpt @@ -11,5 +11,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0)); ?> DONE --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d DONE diff --git a/ext/openssl/tests/cve-2013-6420.phpt b/ext/openssl/tests/cve-2013-6420.phpt index 4a4b28ca74..82cbf47ca8 100644 --- a/ext/openssl/tests/cve-2013-6420.phpt +++ b/ext/openssl/tests/cve-2013-6420.phpt @@ -10,7 +10,7 @@ var_dump($info['issuer']['emailAddress'], $info["validFrom_time_t"]); ?> Done --EXPECTF-- -%s openssl_x509_parse(): illegal length in timestamp in %s%ecve-2013-6420.php on line 3 +%s openssl_x509_parse(): Illegal length in timestamp in %s%ecve-2013-6420.php on line 3 string(27) "stefan.esser@sektioneins.de" int(-1) Done diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt index 6774245dad..c18ac2a22e 100644 --- a/ext/openssl/tests/openssl_csr_new_basic.phpt +++ b/ext/openssl/tests/openssl_csr_new_basic.phpt @@ -23,7 +23,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions" echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_new(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed; check error queue and value of string_mask OpenSSL option if illegal characters are reported) in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt index 01306599ad..03e070e52b 100644 --- a/ext/openssl/tests/openssl_csr_sign_basic.phpt +++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt @@ -47,23 +47,23 @@ resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_sign(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) diff --git a/ext/openssl/tests/openssl_open_basic.phpt b/ext/openssl/tests/openssl_open_basic.phpt index d564bcf8e8..fc41022818 100644 --- a/ext/openssl/tests/openssl_open_basic.phpt +++ b/ext/openssl/tests/openssl_open_basic.phpt @@ -22,7 +22,7 @@ var_dump($output4); --EXPECTF-- string(19) "openssl_open() test" -Warning: openssl_open(): unable to coerce parameter 4 into a private key in %s on line %d +Warning: openssl_open(): Unable to coerce parameter 4 into a private key in %s on line %d NULL string(19) "openssl_open() test" NULL diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 89741f29c4..18fbeb0fd6 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -74,6 +74,6 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) diff --git a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt index c6082bc645..41d2fbdedd 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt @@ -48,11 +48,11 @@ bool(true) bool(true) int(3) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt index f079ec8aac..994a0f85d5 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt @@ -53,11 +53,11 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export_to_file(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt index 407eb3aacd..92d7f2789e 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt @@ -27,11 +27,11 @@ if (file_exists($pkcsfile)) { } ?> --EXPECTF-- -Warning: openssl_pkcs12_export_to_file(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): private key does not correspond to cert in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Private key does not correspond to cert in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): error opening file . in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Error opening file . in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt index 937180a22e..f96fd401cd 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt @@ -45,22 +45,22 @@ if (file_exists($outfile)) { bool(true) bool(true) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) bool(false) bool(false) bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) true true diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index 63dabe8f32..d7ae715efb 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -33,12 +33,12 @@ echo "Done\n"; Object of class stdClass could not be converted to string object(stdClass)#1 (0) { } -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) Done diff --git a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt index 08c96f8069..9b9ff91ddd 100644 --- a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt @@ -40,21 +40,21 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening output file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening output file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting private key in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting private key in %s on line %d bool(false) true diff --git a/ext/openssl/tests/openssl_private_decrypt_basic.phpt b/ext/openssl/tests/openssl_private_decrypt_basic.phpt index c318fe89b1..6c1401a99a 100644 --- a/ext/openssl/tests/openssl_private_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_private_decrypt_basic.phpt @@ -31,7 +31,7 @@ NULL bool(false) NULL -Warning: openssl_private_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_private_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_private_decrypt(): key parameter is not a valid private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_public_decrypt_basic.phpt b/ext/openssl/tests/openssl_public_decrypt_basic.phpt index 6c6fdc90f8..f6cd0aa5f0 100644 --- a/ext/openssl/tests/openssl_public_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_public_decrypt_basic.phpt @@ -33,13 +33,13 @@ NULL bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt index 18d3808745..0914ab6df2 100644 --- a/ext/openssl/tests/openssl_seal_basic.phpt +++ b/ext/openssl/tests/openssl_seal_basic.phpt @@ -27,7 +27,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong))); echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d @@ -35,12 +35,12 @@ bool(false) int(19) int(19) -Warning: openssl_seal(): not a public key (2th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (2th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d bool(false) -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt index c88d79f323..bbccda64a4 100644 --- a/ext/openssl/tests/openssl_sign_basic.phpt +++ b/ext/openssl/tests/openssl_sign_basic.phpt @@ -14,5 +14,5 @@ var_dump(openssl_sign($data, $sign, $wrong)); --EXPECTF-- bool(true) -Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d +Warning: openssl_sign(): Supplied key param cannot be coerced into a private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_verify_basic.phpt b/ext/openssl/tests/openssl_verify_basic.phpt index 84d69502bf..99ec78129d 100644 --- a/ext/openssl/tests/openssl_verify_basic.phpt +++ b/ext/openssl/tests/openssl_verify_basic.phpt @@ -19,10 +19,10 @@ var_dump(openssl_verify($wrong, $sign, $pubkey)); --EXPECTF-- int(1) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_basic.phpt b/ext/openssl/tests/openssl_x509_export_basic.phpt index aecf569489..03baae9266 100644 --- a/ext/openssl/tests/openssl_x509_export_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_basic.phpt @@ -32,11 +32,11 @@ var_dump(strcmp($output, $output5)); // different bool(true) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt index 7fb6c02168..45037449a9 100644 --- a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt @@ -32,11 +32,11 @@ if (file_exists($outfilename)) { bool(true) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) --- bool(true) diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt index b2a87faa83..14f8c0c1ce 100644 --- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt @@ -36,7 +36,7 @@ string(32) "ac77008e172897e06c0b065294487a67" string(40) "6e6fd1ea10a5a23071d61c728ee9b40df6dbc33c" ** Testing bad certification ** -Warning: openssl_x509_fingerprint(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_fingerprint(): Cannot get cert from parameter 1 in %s on line %d bool(false) ** Testing bad hash method ** diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt index f7579c7e81..d3aeadd29b 100644 --- a/ext/openssl/tests/openssl_x509_read_basic.phpt +++ b/ext/openssl/tests/openssl_x509_read_basic.phpt @@ -25,12 +25,12 @@ var_dump(openssl_x509_read($f)); // read an array with the filename resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index 87410dd16d..f981141f83 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -48,5 +48,5 @@ Warning: stream_socket_client(): Unable to locate peer certificate CN in %s on l Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt index 8a8131542d..b47ab97adc 100644 --- a/ext/openssl/tests/stream_security_level.phpt +++ b/ext/openssl/tests/stream_security_level.phpt @@ -67,5 +67,5 @@ error:1416F086:SSL routines:tls_process_server_certificate:certificate verify fa Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d bool(false) diff --git a/ext/openssl/tests/stream_verify_peer_name_003.phpt b/ext/openssl/tests/stream_verify_peer_name_003.phpt index 1770c357bd..a87b161b6a 100644 --- a/ext/openssl/tests/stream_verify_peer_name_003.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_003.phpt @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`stream_verify_peer_name_00 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 30863be6e9..da175dcfb9 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1262,7 +1262,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* bio = BIO_new_file(Z_STRVAL_P(zdhpath), PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY)); if (bio == NULL) { - php_error_docref(NULL, E_WARNING, "invalid dh_param"); + php_error_docref(NULL, E_WARNING, "Invalid dh_param"); return FAILURE; } @@ -1270,12 +1270,12 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* BIO_free(bio); if (dh == NULL) { - php_error_docref(NULL, E_WARNING, "failed reading DH params"); + php_error_docref(NULL, E_WARNING, "Failed reading DH params"); return FAILURE; } if (SSL_CTX_set_tmp_dh(ctx, dh) < 0) { - php_error_docref(NULL, E_WARNING, "failed assigning DH params"); + php_error_docref(NULL, E_WARNING, "Failed assigning DH params"); DH_free(dh); return FAILURE; } @@ -1308,14 +1308,14 @@ static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) / curve_nid = OBJ_sn2nid(Z_STRVAL_P(zvcurve)); if (curve_nid == NID_undef) { - php_error_docref(NULL, E_WARNING, "invalid ecdh_curve specified"); + php_error_docref(NULL, E_WARNING, "Invalid ecdh_curve specified"); return FAILURE; } } ecdh = EC_KEY_new_by_curve_name(curve_nid); if (ecdh == NULL) { - php_error_docref(NULL, E_WARNING, "failed generating ECDH curve"); + php_error_docref(NULL, E_WARNING, "Failed generating ECDH curve"); return FAILURE; } @@ -1403,7 +1403,7 @@ static SSL_CTX *php_openssl_create_sni_server_ctx(char *cert_path, char *key_pat if (SSL_CTX_use_certificate_chain_file(ctx, cert_path) != 1) { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; " \ + "Failed setting local cert chain file `%s'; " \ "check that your cafile/capath settings include " \ "details of your certificate and its issuer", cert_path @@ -1412,7 +1412,7 @@ static SSL_CTX *php_openssl_create_sni_server_ctx(char *cert_path, char *key_pat return NULL; } else if (SSL_CTX_use_PrivateKey_file(ctx, key_path, SSL_FILETYPE_PEM) != 1) { php_error_docref(NULL, E_WARNING, - "failed setting private key from file `%s'", + "Failed setting private key from file `%s'", key_path ); SSL_CTX_free(ctx); @@ -1492,7 +1492,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre } if (!VCWD_REALPATH(ZSTR_VAL(local_cert_str), resolved_cert_path_buff)) { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; file not found", + "Failed setting local cert chain file `%s'; file not found", ZSTR_VAL(local_cert_str) ); zend_string_release(local_cert_str); @@ -1514,7 +1514,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre } if (!VCWD_REALPATH(ZSTR_VAL(local_pk_str), resolved_pk_path_buff)) { php_error_docref(NULL, E_WARNING, - "failed setting local private key file `%s'; file not found", + "Failed setting local private key file `%s'; file not found", ZSTR_VAL(local_pk_str) ); zend_string_release(local_pk_str); @@ -1528,7 +1528,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre ctx = php_openssl_create_sni_server_ctx(resolved_path_buff, resolved_path_buff); } else { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; file not found", + "Failed setting local cert chain file `%s'; file not found", Z_STRVAL_P(current) ); return FAILURE; @@ -1808,9 +1808,9 @@ int php_openssl_setup_crypto(php_stream *stream, if (cparam->inputs.session) { if (cparam->inputs.session->ops != &php_openssl_socket_ops) { - php_error_docref(NULL, E_WARNING, "supplied session stream must be an SSL enabled stream"); + php_error_docref(NULL, E_WARNING, "Supplied session stream must be an SSL enabled stream"); } else if (((php_openssl_netstream_data_t*)cparam->inputs.session->abstract)->ssl_handle == NULL) { - php_error_docref(NULL, E_WARNING, "supplied SSL session stream is not initialized"); + php_error_docref(NULL, E_WARNING, "Supplied SSL session stream is not initialized"); } else { SSL_copy_session_id(sslsock->ssl_handle, ((php_openssl_netstream_data_t*)cparam->inputs.session->abstract)->ssl_handle); } |