@@ -1933,7 +1933,7 @@ PHP_FUNCTION(openssl_spki_verify)
1933
1933
{
1934
1934
size_t spkstr_len ;
1935
1935
int i = 0 , spkstr_cleaned_len = 0 ;
1936
- char * spkstr = NULL , * spkstr_cleaned = NULL ;
1936
+ char * spkstr , * spkstr_cleaned = NULL ;
1937
1937
1938
1938
EVP_PKEY * pkey = NULL ;
1939
1939
NETSCAPE_SPKI * spki = NULL ;
@@ -1943,11 +1943,6 @@ PHP_FUNCTION(openssl_spki_verify)
1943
1943
}
1944
1944
RETVAL_FALSE ;
1945
1945
1946
- if (spkstr == NULL ) {
1947
- php_error_docref (NULL , E_WARNING , "Unable to use supplied SPKAC" );
1948
- goto cleanup ;
1949
- }
1950
-
1951
1946
spkstr_cleaned = emalloc (spkstr_len + 1 );
1952
1947
spkstr_cleaned_len = (int )(spkstr_len - php_openssl_spki_cleanup (spkstr , spkstr_cleaned ));
1953
1948
@@ -1997,7 +1992,7 @@ PHP_FUNCTION(openssl_spki_verify)
1997
1992
PHP_FUNCTION (openssl_spki_export )
1998
1993
{
1999
1994
size_t spkstr_len ;
2000
- char * spkstr = NULL , * spkstr_cleaned = NULL , * s = NULL ;
1995
+ char * spkstr , * spkstr_cleaned = NULL , * s = NULL ;
2001
1996
int spkstr_cleaned_len ;
2002
1997
2003
1998
EVP_PKEY * pkey = NULL ;
@@ -2009,11 +2004,6 @@ PHP_FUNCTION(openssl_spki_export)
2009
2004
}
2010
2005
RETVAL_FALSE ;
2011
2006
2012
- if (spkstr == NULL ) {
2013
- php_error_docref (NULL , E_WARNING , "Unable to use supplied SPKAC" );
2014
- goto cleanup ;
2015
- }
2016
-
2017
2007
spkstr_cleaned = emalloc (spkstr_len + 1 );
2018
2008
spkstr_cleaned_len = (int )(spkstr_len - php_openssl_spki_cleanup (spkstr , spkstr_cleaned ));
2019
2009
@@ -2072,7 +2062,7 @@ PHP_FUNCTION(openssl_spki_export)
2072
2062
PHP_FUNCTION (openssl_spki_export_challenge )
2073
2063
{
2074
2064
size_t spkstr_len ;
2075
- char * spkstr = NULL , * spkstr_cleaned = NULL ;
2065
+ char * spkstr , * spkstr_cleaned = NULL ;
2076
2066
int spkstr_cleaned_len ;
2077
2067
2078
2068
NETSCAPE_SPKI * spki = NULL ;
@@ -2082,11 +2072,6 @@ PHP_FUNCTION(openssl_spki_export_challenge)
2082
2072
}
2083
2073
RETVAL_FALSE ;
2084
2074
2085
- if (spkstr == NULL ) {
2086
- php_error_docref (NULL , E_WARNING , "Unable to use supplied SPKAC" );
2087
- goto cleanup ;
2088
- }
2089
-
2090
2075
spkstr_cleaned = emalloc (spkstr_len + 1 );
2091
2076
spkstr_cleaned_len = (int )(spkstr_len - php_openssl_spki_cleanup (spkstr , spkstr_cleaned ));
2092
2077
0 commit comments