From fc7396568e61a510b9336d6c220aaa889c03060f Mon Sep 17 00:00:00 2001
From: djm <>
Date: Thu, 3 Nov 2011 02:34:33 +0000
Subject: openssl-1.0.0e: resolve conflicts

---
 src/lib/libcrypto/ec/ec2_smpl.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/libcrypto/ec/ec2_smpl.c')

diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index cf357b462a..af94458ca7 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -937,6 +937,9 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT
 		{
 		return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
 		}
+
+	if (EC_POINT_is_at_infinity(group, b))
+		return 1;
 	
 	if (a->Z_is_one && b->Z_is_one)
 		{
-- 
cgit v1.2.3-55-g6feb