rpms/globus-gsi-cert-utils/F-13 globus-gsi-cert-utils-oid.patch, NONE, 1.1 globus-gsi-cert-utils.spec, 1.6, 1.7 import.log, 1.4, 1.5
Mattias Ellert
ellert at fedoraproject.org
Sat Jun 5 15:19:44 UTC 2010
- Previous message: rpms/globus-gsi-cert-utils/devel globus-gsi-cert-utils-oid.patch, NONE, 1.1 globus-gsi-cert-utils.spec, 1.6, 1.7 import.log, 1.4, 1.5
- Next message: rpms/globus-gsi-cert-utils/F-12 globus-gsi-cert-utils-oid.patch, NONE, 1.1 globus-gsi-cert-utils.spec, 1.6, 1.7 import.log, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-gsi-cert-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3020/F-13
Modified Files:
globus-gsi-cert-utils.spec import.log
Added Files:
globus-gsi-cert-utils-oid.patch
Log Message:
* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-2
- Fix OID registration pollution
globus-gsi-cert-utils-oid.patch:
globus_gsi_cert_utils.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE globus-gsi-cert-utils-oid.patch ---
diff -ur globus_gsi_cert_utils-6.5.orig/library/globus_gsi_cert_utils.c globus_gsi_cert_utils-6.5/library/globus_gsi_cert_utils.c
--- globus_gsi_cert_utils-6.5.orig/library/globus_gsi_cert_utils.c 2008-09-09 18:46:20.000000000 +0200
+++ globus_gsi_cert_utils-6.5/library/globus_gsi_cert_utils.c 2010-05-15 20:33:56.134248963 +0200
@@ -331,7 +331,7 @@
*type = GLOBUS_GSI_CERT_UTILS_TYPE_GSI_2_LIMITED_PROXY;
}
else if((index = X509_get_ext_by_NID(cert,
- OBJ_sn2nid(PROXYCERTINFO_SN),
+ OBJ_txt2nid(PROXYCERTINFO_OID),
-1)) != -1 &&
(pci_ext = X509_get_ext(cert,index)) &&
X509_EXTENSION_get_critical(pci_ext))
@@ -368,15 +368,15 @@
policy_nid = OBJ_obj2nid(policy_lang);
- if(policy_nid == OBJ_sn2nid(IMPERSONATION_PROXY_SN))
+ if(policy_nid == OBJ_txt2nid(IMPERSONATION_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_RFC_IMPERSONATION_PROXY;
}
- else if(policy_nid == OBJ_sn2nid(INDEPENDENT_PROXY_SN))
+ else if(policy_nid == OBJ_txt2nid(INDEPENDENT_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_RFC_INDEPENDENT_PROXY;
}
- else if(policy_nid == OBJ_sn2nid(LIMITED_PROXY_SN))
+ else if(policy_nid == OBJ_txt2nid(LIMITED_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_RFC_LIMITED_PROXY;
}
@@ -386,7 +386,7 @@
}
if(X509_get_ext_by_NID(cert,
- OBJ_sn2nid(PROXYCERTINFO_SN),
+ OBJ_txt2nid(PROXYCERTINFO_OID),
index) != -1)
{
GLOBUS_GSI_CERT_UTILS_OPENSSL_ERROR_RESULT(
@@ -397,7 +397,7 @@
}
}
else if((index = X509_get_ext_by_NID(cert,
- OBJ_sn2nid(PROXYCERTINFO_OLD_SN),
+ OBJ_txt2nid(PROXYCERTINFO_OLD_OID),
-1)) != -1 &&
(pci_ext = X509_get_ext(cert,index)) &&
X509_EXTENSION_get_critical(pci_ext))
@@ -434,15 +434,15 @@
policy_nid = OBJ_obj2nid(policy_lang);
- if(policy_nid == OBJ_sn2nid(IMPERSONATION_PROXY_SN))
+ if(policy_nid == OBJ_txt2nid(IMPERSONATION_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_GSI_3_IMPERSONATION_PROXY;
}
- else if(policy_nid == OBJ_sn2nid(INDEPENDENT_PROXY_SN))
+ else if(policy_nid == OBJ_txt2nid(INDEPENDENT_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_GSI_3_INDEPENDENT_PROXY;
}
- else if(policy_nid == OBJ_sn2nid(LIMITED_PROXY_SN))
+ else if(policy_nid == OBJ_txt2nid(LIMITED_PROXY_OID))
{
*type = GLOBUS_GSI_CERT_UTILS_TYPE_GSI_3_LIMITED_PROXY;
}
@@ -452,7 +452,7 @@
}
if(X509_get_ext_by_NID(cert,
- OBJ_sn2nid(PROXYCERTINFO_OLD_SN),
+ OBJ_txt2nid(PROXYCERTINFO_OLD_OID),
index) != -1)
{
GLOBUS_GSI_CERT_UTILS_OPENSSL_ERROR_RESULT(
Index: globus-gsi-cert-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-13/globus-gsi-cert-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- globus-gsi-cert-utils.spec 16 Apr 2010 14:46:36 -0000 1.6
+++ globus-gsi-cert-utils.spec 5 Jun 2010 15:19:44 -0000 1.7
@@ -7,7 +7,7 @@
Name: globus-gsi-cert-utils
%global _name %(tr - _ <<< %{name})
Version: 6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Globus GSI Cert Utils Library
Group: System Environment/Libraries
@@ -26,6 +26,9 @@ Source9: epstopdf-2.9.5gw
# Improve the error message for missing CA setup files:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6964
Patch0: %{name}-ca-setup.patch
+# Fix duplicate OID registrations:
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7032
+Patch1: %{name}-oid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-openssl%{?_isa} >= 1
@@ -111,6 +114,7 @@ Globus GSI Cert Utils Library Documentat
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -228,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Mon May 31 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-2
+- Fix OID registration pollution
+
* Wed Apr 14 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.5-1
- Update to Globus Toolkit 5.0.1
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-cert-utils/F-13/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 16 Apr 2010 14:46:36 -0000 1.4
+++ import.log 5 Jun 2010 15:19:44 -0000 1.5
@@ -2,3 +2,4 @@ globus-gsi-cert-utils-5_5-1_fc9:HEAD:glo
globus-gsi-cert-utils-5_5-2_fc9:HEAD:globus-gsi-cert-utils-5.5-2.fc9.src.rpm:1245083781
globus-gsi-cert-utils-6_4-1_fc12:HEAD:globus-gsi-cert-utils-6.4-1.fc12.src.rpm:1265701251
globus-gsi-cert-utils-6_5-1_fc12:F-13:globus-gsi-cert-utils-6.5-1.fc12.src.rpm:1271429179
+globus-gsi-cert-utils-6_5-2_fc12:F-13:globus-gsi-cert-utils-6.5-2.fc12.src.rpm:1275751168
- Previous message: rpms/globus-gsi-cert-utils/devel globus-gsi-cert-utils-oid.patch, NONE, 1.1 globus-gsi-cert-utils.spec, 1.6, 1.7 import.log, 1.4, 1.5
- Next message: rpms/globus-gsi-cert-utils/F-12 globus-gsi-cert-utils-oid.patch, NONE, 1.1 globus-gsi-cert-utils.spec, 1.6, 1.7 import.log, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list