head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2018.04.30.06.50.58;	author ryoon;	state dead;
branches;
next	1.1;
commitid	XG72rGh1t9hiUqAA;

1.1
date	2018.04.30.05.25.24;	author ryoon;	state Exp;
branches;
next	;
commitid	D2tgEQOGDYBVqqAA;


desc
@@


1.2
log
@Revert previous security/openssl is 1.0

Pointed by wiz@@, thank you.
@
text
@$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoX509.cpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $

--- xsec/enc/OpenSSL/OpenSSLCryptoX509.cpp.orig	2012-07-23 16:56:11.000000000 +0000
+++ xsec/enc/OpenSSL/OpenSSLCryptoX509.cpp
@@@@ -191,7 +191,7 @@@@ XSECCryptoKey::KeyType OpenSSLCryptoX509
 
 	XSECCryptoKey::KeyType ret;
 
-	switch (pkey->type) {
+	switch (EVP_PKEY_base_id(pkey)) {
 
 	case EVP_PKEY_DSA :
 
@@@@ -241,7 +241,7 @@@@ XSECCryptoKey * OpenSSLCryptoX509::clone
 			"OpenSSL:X509 - cannot retrieve public key from cert");
 	}
 
-	switch (pkey->type) {
+	switch (EVP_PKEY_base_id(pkey)) {
 
 	case EVP_PKEY_DSA :
 
@


1.1
log
@Fix build with OpenSSL 1.1

* From Fedora's xml-security-c-1.7.3_openssl1.1.patch
* Use OpenSSL 1.1 with BUILDLINK_API_DEPENDS
@
text
@d1 1
a1 1
$NetBSD$
@