ucspi-ssl: update to 0.99.

This commit is contained in:
Leah Neukirchen 2017-03-11 20:30:16 +01:00
parent 6b99f816ce
commit 2381475bc7
2 changed files with 58 additions and 2 deletions

View File

@ -0,0 +1,56 @@
--- host/superscript.com/net/ucspi-ssl-0.99/src/ssl_env.c.orig
+++ host/superscript.com/net/ucspi-ssl-0.99/src/ssl_env.c
@@ -47,7 +47,7 @@
int n;
if (!env) return 1;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
for (m = 0; m < sk_X509_NAME_ENTRY_num(xname->entries); m++) {
xne = sk_X509_NAME_ENTRY_value(xname->entries,m);
n = OBJ_obj2nid(xne->object);
@@ -76,7 +76,7 @@
if (!env_str("SSL_PROTOCOL",SSL_get_version(ssl)))
return 0;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
session = SSL_get_session(ssl);
x = session->session_id;
n = session->session_id_length;
@@ -227,7 +227,7 @@
set_env_id(xname,"SSL_CLIENT_I_DN_Email",NID_pkcs9_emailAddress);
/* Signature Algorithm for PubKey */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
n = OBJ_obj2nid(cert->cert_info->signature->algorithm);
#else
sigalg = X509_get0_tbs_sigalg(cert);
@@ -238,7 +238,7 @@
return 0;
/* Algorithm for PubKey */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
n = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
#else
pubkey = X509_get_X509_PUBKEY(cert);
@@ -371,7 +371,7 @@
set_env_id(xname,"SSL_SERVER_I_DN_Email",NID_pkcs9_emailAddress);
/* Signature Algorithm of PubKey */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
n = OBJ_obj2nid(cert->cert_info->signature->algorithm);
#else
sigalg = X509_get0_tbs_sigalg(cert);
@@ -382,7 +382,7 @@
return 0;
/* Algorithm of PubKey */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
n = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
#else
pubkey = X509_get_X509_PUBKEY(cert);

View File

@ -1,6 +1,6 @@
# Template file for 'ucspi-ssl'
pkgname=ucspi-ssl
version=0.98b
version=0.99
revision=1
short_desc="Command-line tools for building SSL client-server applications"
maintainer="Evan Deaubl <evan@deaubl.name>"
@ -11,7 +11,7 @@ makedepends="libressl-devel"
depends="ucspi-tcp"
homepage="http://www.fehcom.de/ipnet/ucspi-ssl.html"
distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/${pkgname}-${version}.tgz"
checksum=10d4f47c7085d8b0b56b026901569d73bb366a73825f4042b6c99cbcde506ff3
checksum=083421b4da939221e01f3e576a3d7c7d49c78ab46e782ef31f6310e8a847d6c3
wrksrc="${pkgname}-${version}"
create_wrksrc=yes
build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"