Patch spki.patch for OpenSSL related Bug #38917

Patch version 2011-12-08 10:57 UTC

Developer: jason.gerfen@gmail.com

Line 1 (now 1), was 25 lines, now 22 lines
 --- php-5.3.8/ext/openssl/openssl.c	2011-07-25 05:42:53.000000000 -0600
 +++ php-5.3.8/ext/openssl/openssl.c	2011-12-13 09:12:25.000000000 -0700
 @@ -372,11 +372,39 @@
 --- php-5.3.8/ext/openssl/openssl.c 
 +++ php-5.3.8/ext/openssl/openssl.c 
 @@ -372,11 +372,35 @@
       ZEND_ARG_INFO(0, length)
       ZEND_ARG_INFO(1, result_is_strong)
   ZEND_END_ARG_INFO()
  +
  +ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_spki_new, 0, 0, 0)
  +    ZEND_ARG_INFO(0, privkey)
  +    ZEND_ARG_INFO(0, password)
 +    ZEND_ARG_INFO(0, spki_hash)
  +ZEND_END_ARG_INFO()
  +
  +ZEND_BEGIN_ARG_INFO(arginfo_openssl_spki_verify, 0)
  +    ZEND_ARG_INFO(0, spki)
  +ZEND_END_ARG_INFO()
  +
  +ZEND_BEGIN_ARG_INFO(arginfo_openssl_spki_export, 0)
 +    ZEND_ARG_INFO(0, spki)
 +ZEND_END_ARG_INFO()
 +
 +ZEND_BEGIN_ARG_INFO(arginfo_openssl_spki_export_challenge, 0)
  +    ZEND_ARG_INFO(0, spki)
  +ZEND_END_ARG_INFO()
  +
  +ZEND_BEGIN_ARG_INFO(arginfo_openssl_spki_details, 0)
Line 33 (now 30), was 34 lines, now 30 lines

  +/* spki functions */
  +	PHP_FE(openssl_spki_new, 		arginfo_openssl_spki_new)
  +	PHP_FE(openssl_spki_verify,		arginfo_openssl_spki_verify)
  +	PHP_FE(openssl_spki_export,		arginfo_openssl_spki_export)
 + PHP_FE(openssl_spki_export_challenge,		arginfo_openssl_spki_export_challenge)
  + PHP_FE(openssl_spki_details,		arginfo_openssl_spki_details)
  +
   /* public/private key functions */
   	PHP_FE(openssl_pkey_free,			arginfo_openssl_pkey_free)
   	PHP_FE(openssl_pkey_new,			arginfo_openssl_pkey_new)
 @@ -1252,6 +1280,243 @@
 @@ -1252,6 +1276,190 @@
   }
   /* }}} */
   
 +/* {{{ proto string openssl_spki_new(mixed zpkey, string password)
 +/* {{{ proto string openssl_spki_new(mixed priv_key, string password)
  +   Creates new private key (or uses existing) and creates a new spki cert
  +   outputting results to var */
  +PHP_FUNCTION(openssl_spki_new)
 +{
 +{
  + zval * zout, * zpkey = NULL;
  + EVP_PKEY * pkey = NULL;
  + NETSCAPE_SPKI *spki=NULL;
  + char * password, * spkstr;
  + long keyresource = -1;
  + const char *spkac = "SPKAC=";
  +
 + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s", &zpkey, &password, &zout) == FAILURE) {
 +  return;
 + }
 + RETVAL_FALSE;
 + zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|s", &zpkey, &password, &zout);
  +
  + pkey = php_openssl_evp_from_zval(&zpkey, 0, password, 1, &keyresource TSRMLS_CC);
  +
  + if (pkey == NULL) {
Line 84 (now 77), was 27 lines, now 25 lines

  + }
  +
  + spkstr = NETSCAPE_SPKI_b64_encode(spki);
  +
 + char * s = malloc(snprintf(NULL, 0, "%s%s", spkac, spkstr)+1);
 + char * s = malloc(snprintf(NULL, 0, "%s%s", spkac, spkstr));
  + sprintf(s, "%s%s", spkac, spkstr);
  +
 + if (strlen(s)<=0) {
 +  goto cleanup;
 + }
 + RETURN_STRING(s, 1);
 + if (strlen(s)>0) {
 +  RETVAL_STRINGL(s, strlen(s), 0);
 + } else {
 +  RETURN_FALSE;
 + }
  +
  +cleanup:
 + if (keyresource == -1 && spki) {
 + if (keyresource == -1 && pkey) {
  +  NETSCAPE_SPKI_free(spki);
 + }
 + if (keyresource == -1 && pkey) {
  +  EVP_PKEY_free(pkey);
  + }
 + if (keyresource == -1 && s) {
 +  free(s);
 + if (spkstr) {
 +  OPENSSL_free(spkstr);
  + }
 + RETURN_NULL();
  +}
  +/* }}} */
  +
  +/* {{{ proto bool openssl_spki_verify(string spki)
Line 116 (now 107), was 24 lines, now 23 lines

  + EVP_PKEY *pkey = NULL;
  + NETSCAPE_SPKI *spki = NULL;
  +
  + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &spkstr, &spkstr_len) == FAILURE) {
 +  return;
 + }
 +
 +  php_error_docref(NULL TSRMLS_CC, E_WARNING, "missing argument 1");
 +  goto cleanup;
 + }
 +
  + if (!spkstr) {
  +  goto cleanup;
  + }
  +
 + spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
 + if (!spki) {
 +  php_error_docref(NULL TSRMLS_CC, E_WARNING, "decode");
 +  goto cleanup;
 + }
 +
 + pkey = NETSCAPE_SPKI_get_pubkey(spki);
 + if (pkey == NULL) {
 +  php_error_docref(NULL TSRMLS_CC, E_WARNING, "pub");
 + spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
 + if (!spki) {
 +  goto cleanup;
 + }
 +
 + pkey = NETSCAPE_SPKI_get_pubkey(spki);
 + if (pkey == NULL) {
  +  goto cleanup;
  + }
  +
  + i = NETSCAPE_SPKI_verify(spki, pkey);


  +{
  + int spkstr_len;
  + EVP_PKEY *pkey = NULL;
  + NETSCAPE_SPKI *spki = NULL;
 + BIO *out = BIO_new(BIO_s_mem());
 + BUF_MEM *bio_buf;
 + BIO *out = BIO_new_fp(stdout, BIO_CLOSE);
  + char *spkstr;
  +
  + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &spkstr, &spkstr_len) == FAILURE) {
 +  php_error_docref(NULL TSRMLS_CC, E_WARNING, "missing argument 1");
  +  goto cleanup;
  + }
  +
  + if (!spkstr) {
Line 178 (now 168), was 124 lines, now 77 lines

  +  goto cleanup;
  + }
  +
  + pkey = NETSCAPE_SPKI_get_pubkey(spki);
 + if (!pkey) {
 +  goto cleanup;
 + }
 +
 + PEM_write_bio_PUBKEY(out, pkey);
 + BIO_get_mem_ptr(out, &bio_buf);
 +
 + if (sizeof(bio_buf->data)<=0) {
 +  goto cleanup;
 + }
 +
 + char * s = malloc(snprintf(NULL, 0, "%s", bio_buf->data)+1);
 + sprintf(s, "%s", bio_buf->data);
 + RETURN_STRING(s, 1);
 +
 +cleanup:
 + if (spki) {
 +  NETSCAPE_SPKI_free(spki);
 + }
 + if (out) {
 +  BIO_free_all(out);
 + }
 + if (pkey) {
 +  EVP_PKEY_free(pkey);
 + }
 +}
 +/* }}} */
 +
 +/* {{{ proto string openssl_spki_export_challenge(string spki)
 +   Exports spkac challenge from existing spki to var */
 +PHP_FUNCTION(openssl_spki_export_challenge)
 +{
 + int spkstr_len;
 + NETSCAPE_SPKI *spki = NULL;
 + char *spkstr;
 +
 + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &spkstr, &spkstr_len) == FAILURE) {
 +  goto cleanup;
 + }
 +
 + if (!spkstr) {
 +  goto cleanup;
 + }
 +
 + spki = NETSCAPE_SPKI_b64_decode(spkstr, strlen(spkstr));
 + if (!spki) {
 +  goto cleanup;
 + if (!pkey) {
 +  goto cleanup;
  + }
  +
 + RETURN_STRING(ASN1_STRING_data(spki->spkac->challenge), 1);
 +
 + PEM_write_bio_PUBKEY(out, pkey);
 +
  +cleanup:
  + if (spki) {
  +  NETSCAPE_SPKI_free(spki);
 + }
 + if (out) {
 +  BIO_free_all(out);
 + }
 + if (pkey) {
 +  EVP_PKEY_free(pkey);
  + }
  +}
  +/* }}} */
  +
  +/* {{{ proto string openssl_spki_details(string spki)
  +   Provides details from existing spki to var */
  +PHP_FUNCTION(openssl_spki_details)
  +{
 + BUF_MEM *buf;
  + int spkstr_len;
  + NETSCAPE_SPKI *spki = NULL;
 + BIO *out = BIO_new(BIO_s_mem());
 + BUF_MEM *bio_buf;
 + zval *zout;
 + BIO *out = BIO_new_fp(stdout, BIO_NOCLOSE);
  + char *spkstr;
  +
  + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &spkstr, &spkstr_len) == FAILURE) {
 +  return;
 +  php_error_docref(NULL TSRMLS_CC, E_WARNING, "missing argument 1");
 +  goto cleanup;
  + }
 + RETVAL_FALSE;
  +
  + if (!spkstr) {
 +  goto cleanup;
 + }
 +  goto cleanup;
 + }
  +
  + spki = NETSCAPE_SPKI_b64_decode(spkstr, strlen(spkstr));
  + if (!spki) {
  +  goto cleanup;
 + }
 + }
  +
  + NETSCAPE_SPKI_print(out, spki);
 + BIO_get_mem_ptr(out, &bio_buf);
 +
 + if (sizeof(bio_buf->data)<=0) {
 +  goto cleanup;
 + }
 +
 + char * s = malloc(snprintf(NULL, 0, "%s", bio_buf->data)+1);
 + sprintf(s, "%s", bio_buf->data);
 + RETURN_STRING(s, 1);
  +
  +cleanup:
  + if (spki) {
  +  NETSCAPE_SPKI_free(spki);
  + }
 + BIO_free_all(out);
 + if (out) {
 +  BIO_free_all(out);
 + }
  +}
  +/* }}} */
  +
   /* {{{ proto bool openssl_x509_export(mixed x509, string &out [, bool notext = true])
      Exports a CERT to file or a var */
   PHP_FUNCTION(openssl_x509_export)
 --- php-5.3.8/ext/openssl/php_openssl.h	2010-12-31 19:19:59.000000000 -0700
 +++ php-5.3.8/ext/openssl/php_openssl.h	2011-12-12 12:47:26.000000000 -0700
 @@ -74,6 +74,12 @@
 
 --- php-5.3.8/ext/openssl/php_openssl.h 
 +++ php-5.3.8/ext/openssl/php_openssl.h 
 @@ -74,6 +74,11 @@
   PHP_FUNCTION(openssl_csr_sign);
   PHP_FUNCTION(openssl_csr_get_subject);
   PHP_FUNCTION(openssl_csr_get_public_key);
  +
  +PHP_FUNCTION(openssl_spki_new);
  +PHP_FUNCTION(openssl_spki_verify);
  +PHP_FUNCTION(openssl_spki_export);
 +PHP_FUNCTION(openssl_spki_export_challenge);
  +PHP_FUNCTION(openssl_spki_details);
   #else
   
   #define phpext_openssl_ptr NULL