s390x assembler pack: add s390x-gf2m.pl and harmonize AES_xts_[en|de]crypt.

[openssl.git] / crypto / bn / bn_sqrt.c

diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
index 51902703e1ed1e8b4ba3e8d621894079feeeacd7..6beaf9e5e5ddfd6da6942c67b045049a7c979ddb 100644 (file)
--- a/crypto/bn/bn_sqrt.c
+++ b/crypto/bn/bn_sqrt.c
@@ -1,4 +1,4 @@
-/* crypto/bn/bn_mod.c */
+/* crypto/bn/bn_sqrt.c */
 /* Written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * and Bodo Moeller for the OpenSSL project. */
 /* ====================================================================
@@ -83,7 +83,8 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                                goto end;
                        if (!BN_set_word(ret, BN_is_bit_set(a, 0)))
                                {
-                               BN_free(ret);
+                               if (ret != in)
+                                       BN_free(ret);
                                return NULL;
                                }
                        bn_check_top(ret);
@@ -102,7 +103,8 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                        goto end;
                if (!BN_set_word(ret, BN_is_one(a)))
                        {
-                       BN_free(ret);
+                       if (ret != in)
+                               BN_free(ret);
                        return NULL;
                        }
                bn_check_top(ret);
@@ -288,7 +290,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                if (BN_is_zero(t))
                        {
                        /* special case: a == 0  (mod p) */
-                       if (!BN_zero(ret)) goto end;
+                       BN_zero(ret);
                        err = 0;
                        goto end;
                        }
@@ -301,7 +303,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                if (BN_is_zero(x))
                        {
                        /* special case: a == 0  (mod p) */
-                       if (!BN_zero(ret)) goto end;
+                       BN_zero(ret);
                        err = 0;
                        goto end;
                        }