From e5bd68fbf698eda6db31914219e0ff7e755a1a02 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 11 Jul 2014 13:26:31 +0000
Subject: Make sure BN_sqr never returns negative numbers. OpenSSL PR #3400 via
 OpenSSL trunk.

---
 src/lib/libcrypto/bn/bn_sqr.c         | 3 ++-
 src/lib/libssl/src/crypto/bn/bn_sqr.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/bn/bn_sqr.c b/src/lib/libcrypto/bn/bn_sqr.c
index d4a9f46040..5ea9fb083d 100644
--- a/src/lib/libcrypto/bn/bn_sqr.c
+++ b/src/lib/libcrypto/bn/bn_sqr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_sqr.c,v 1.10 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_sqr.c,v 1.11 2014/07/11 13:26:31 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,6 +78,7 @@ BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	al = a->top;
 	if (al <= 0) {
 		r->top = 0;
+		r->neg = 0;
 		return 1;
 	}
 
diff --git a/src/lib/libssl/src/crypto/bn/bn_sqr.c b/src/lib/libssl/src/crypto/bn/bn_sqr.c
index d4a9f46040..5ea9fb083d 100644
--- a/src/lib/libssl/src/crypto/bn/bn_sqr.c
+++ b/src/lib/libssl/src/crypto/bn/bn_sqr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_sqr.c,v 1.10 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bn_sqr.c,v 1.11 2014/07/11 13:26:31 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,6 +78,7 @@ BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	al = a->top;
 	if (al <= 0) {
 		r->top = 0;
+		r->neg = 0;
 		return 1;
 	}
 
-- 
cgit v1.2.3-55-g6feb