pajoye Tue Nov 18 01:56:12 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/openssl/tests bug41033.pem bug41033.phpt bug41033pub.pem
Modified files: /php-src/ext/openssl openssl.c Log: - #41033, enable signing with DSA keys http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.25&r2=1.98.2.5.2.41.2.26&diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.25 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.26 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.25 Mon Nov 17 21:54:25 2008 +++ php-src/ext/openssl/openssl.c Tue Nov 18 01:56:12 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.25 2008/11/17 21:54:25 scottmac Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.26 2008/11/18 01:56:12 pajoye Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -58,6 +58,7 @@ #define OPENSSL_ALGO_MD5 2 #define OPENSSL_ALGO_MD4 3 #define OPENSSL_ALGO_MD2 4 +#define OPENSSL_ALGO_DSS1 5 #define DEBUG_SMIME 0 @@ -904,6 +905,9 @@ case OPENSSL_ALGO_MD2: mdtype = (EVP_MD *) EVP_md2(); break; + case OPENSSL_ALGO_DSS1: + mdtype = (EVP_MD *) EVP_dss1(); + break; default: return NULL; break; @@ -983,6 +987,7 @@ REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT); /* flags for S/MIME */ REGISTER_LONG_CONSTANT("PKCS7_DETACHED", PKCS7_DETACHED, CONST_CS|CONST_PERSISTENT); @@ -1470,7 +1475,6 @@ return 0; } X509_STORE_CTX_init(csc, ctx, x, untrustedchain); - if(purpose >= 0) { X509_STORE_CTX_set_purpose(csc, purpose); } http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug41033.pem?view=markup&rev=1.1 Index: php-src/ext/openssl/tests/bug41033.pem +++ php-src/ext/openssl/tests/bug41033.pem http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug41033.phpt?view=markup&rev=1.1 Index: php-src/ext/openssl/tests/bug41033.phpt +++ php-src/ext/openssl/tests/bug41033.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug41033pub.pem?view=markup&rev=1.1 Index: php-src/ext/openssl/tests/bug41033pub.pem +++ php-src/ext/openssl/tests/bug41033pub.pem -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php