[xmlsec] undo commit - it didn't fix the original problem and caused other issues
- From: Aleksey Sanin <aleksey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [xmlsec] undo commit - it didn't fix the original problem and caused other issues
- Date: Thu, 22 May 2014 22:08:00 +0000 (UTC)
commit 66fe5f933f6b0b8b27ee71da48b6407c24981533
Author: Aleksey Sanin <aleksey aleksey com>
Date: Thu May 22 15:07:55 2014 -0700
undo commit - it didn't fix the original problem and caused other issues
src/keys.c | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/src/keys.c b/src/keys.c
index 47fa28e..1d2f733 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -456,7 +456,6 @@ xmlSecKeyReqMatchKey(xmlSecKeyReqPtr keyReq, xmlSecKeyPtr key) {
*/
int
xmlSecKeyReqMatchKeyValue(xmlSecKeyReqPtr keyReq, xmlSecKeyDataPtr value) {
- xmlSecKeyDataType type;
xmlSecAssert2(keyReq != NULL, -1);
xmlSecAssert2(value != NULL, -1);
@@ -471,32 +470,6 @@ xmlSecKeyReqMatchKeyValue(xmlSecKeyReqPtr keyReq, xmlSecKeyDataPtr value) {
return(0);
}
-
- /* Check Key Type against intended usage */
- type = xmlSecKeyDataGetType(value);
- if(type != xmlSecKeyDataTypeUnknown) {
- if((keyReq->keyUsage & xmlSecKeyUsageSign) != 0) {
- if((type & (xmlSecKeyDataTypePrivate | xmlSecKeyDataTypeSymmetric)) == 0) {
- return (0);
- }
- }
- if((keyReq->keyUsage & xmlSecKeyUsageVerify) != 0) {
- if((type & (xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate |
xmlSecKeyDataTypeSymmetric)) == 0) {
- return (0);
- }
- }
- if((keyReq->keyUsage & xmlSecKeyUsageEncrypt) != 0) {
- if((type & (xmlSecKeyDataTypePublic | xmlSecKeyDataTypePrivate |
xmlSecKeyDataTypeSymmetric)) == 0) {
- return (0);
- }
- }
- if((keyReq->keyUsage & xmlSecKeyUsageDecrypt) != 0) {
- if((type & (xmlSecKeyDataTypePrivate | xmlSecKeyDataTypeSymmetric)) == 0) {
- return (0);
- }
- }
- }
-
return(1);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]