Attachment #105709 for bug #146218

View | Details | Raw Unified | Return to bug 146218
Collapse All | Expand All

Lines 531-537 Link Here

(-)ssl_engine_init.c 2010-05-01 22:17:22.000000000 +0900 (-1 / +1 lines)
531	ssl_die();	531	ssl_die();
532	}	532	}
533		533
534	SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);	534	SSL_CTX_set_client_CA_list(ctx, ca_list);
535	}	535	}
536		536
537	/*	537	/*




#ifdef HAVE_SSL_X509V3_EXT_d2i
    X509_EXTENSION *ext;
    int ext_nid;
    STACK_OF(SSL_CIPHER) *sk;
    BOOL is_sgc;
    int idx;
    int i;

    idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
    if (idx >= 0) {
        ext = X509_get_ext(cert, idx);
        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) {

    X509 *x509;
    unsigned long err;
    int n;
    STACK_OF(X509) *extra_certs;

    if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
        return -1;

Return to bug 146218

Lines 291-297 Link Here

(-)ssl_util_ssl.c 2010-05-01 22:20:18.000000000 +0900 (-3 / +3 lines)
291	#ifdef HAVE_SSL_X509V3_EXT_d2i	291	#ifdef HAVE_SSL_X509V3_EXT_d2i
292	X509_EXTENSION *ext;	292	X509_EXTENSION *ext;
293	int ext_nid;	293	int ext_nid;
294	STACK *sk;	294	STACK_OF(SSL_CIPHER) *sk;
295	BOOL is_sgc;	295	BOOL is_sgc;
296	int idx;	296	int idx;
297	int i;	297	int i;
Lines 300-306 Link Here
300	idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);	300	idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
301	if (idx >= 0) {	301	if (idx >= 0) {
302	ext = X509_get_ext(cert, idx);	302	ext = X509_get_ext(cert, idx);
303	if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {	303	if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
304	for (i = 0; i < sk_num(sk); i++) {	304	for (i = 0; i < sk_num(sk); i++) {
305	ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));	305	ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
306	if (ext_nid == NID_ms_sgc \|\| ext_nid == NID_ns_sgc) {	306	if (ext_nid == NID_ms_sgc \|\| ext_nid == NID_ns_sgc) {
Lines 466-472 Link Here
466	X509 *x509;	466	X509 *x509;
467	unsigned long err;	467	unsigned long err;
468	int n;	468	int n;
469	STACK *extra_certs;	469	STACK_OF(X509) *extra_certs;
470		470
471	if ((bio = BIO_new(BIO_s_file_internal())) == NULL)	471	if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
472	return -1;	472	return -1;