[packages/apache1-mod_ssl.git] / openssl.patch

--- mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c~	2010-07-14 17:11:10.000000000 +0300
+++ mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c	2010-07-14 17:11:14.991199635 +0300
@@ -324,7 +324,7 @@
 {
     X509_EXTENSION *ext;
     int ext_nid;
-    STACK *sk;
+    STACK_OF(SSL_CIPHER) *sk;
     BOOL is_sgc;
     int idx;
     int i;
@@ -333,7 +333,7 @@
     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
     if (idx >= 0) {
         ext = X509_get_ext(cert, idx);
-        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
+        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
             for (i = 0; i < sk_num(sk); i++) {
                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
--- mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c~	1999-05-20 13:09:23.000000000 +0300
+++ mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c	2010-07-14 17:23:56.590709905 +0300
@@ -92,7 +92,7 @@
   ASN1_CTX c;
   int i;
   ASN1_INTEGER *version=NULL;
-  STACK *sk;
+  STACK_OF(SSL_CIPHER) *sk;
   THAWTE_SXNET_INTERNAL *t;
   int ret=1;
   int count=0;
Commit	Line	Data
9f12ac0f ER	1	--- mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c~ 2010-07-14 17:11:10.000000000 +0300
	2	+++ mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c 2010-07-14 17:11:14.991199635 +0300
	3	@@ -324,7 +324,7 @@
	4	{
	5	X509_EXTENSION *ext;
	6	int ext_nid;
	7	- STACK *sk;
	8	+ STACK_OF(SSL_CIPHER) *sk;
	9	BOOL is_sgc;
	10	int idx;
	11	int i;
	12	@@ -333,7 +333,7 @@
	13	idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
	14	if (idx >= 0) {
	15	ext = X509_get_ext(cert, idx);
	16	- if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
	17	+ if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
	18	for (i = 0; i < sk_num(sk); i++) {
	19	ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
	20	if (ext_nid == NID_ms_sgc \|\| ext_nid == NID_ns_sgc) {
	21	--- mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c~ 1999-05-20 13:09:23.000000000 +0300
	22	+++ mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c 2010-07-14 17:23:56.590709905 +0300
	23	@@ -92,7 +92,7 @@
	24	ASN1_CTX c;
	25	int i;
	26	ASN1_INTEGER *version=NULL;
	27	- STACK *sk;
	28	+ STACK_OF(SSL_CIPHER) *sk;
	29	THAWTE_SXNET_INTERNAL *t;
	30	int ret=1;
	31	int count=0;