Harmonize Tru64 and Linux make rules.

[oweals/openssl.git] / crypto / srp / srp_vfy.c

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index c8be907d7f7f55826a6ed69e92408894a2655a4b..fdca19ff7c69aff35fdc5f5032fa4db681f7b396 100644 (file)
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -93,6 +93,9 @@ static int t_fromb64(unsigned char *a, const char *src)
                else a[i] = loc - b64table;
                ++i;
                }
+       /* if nothing valid to process we have a zero length response */
+       if (i == 0)
+               return 0;
        size = i;
        i = size - 1;
        j = size;
@@ -390,7 +393,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
                }
        for (i = 0; i < sk_OPENSSL_PSTRING_num(tmpdb->data); i++)
                {
-               pp = (char **)sk_OPENSSL_PSTRING_value(tmpdb->data,i);
+               pp = sk_OPENSSL_PSTRING_value(tmpdb->data,i);
                if (pp[DB_srptype][0] == DB_SRP_INDEX)
                        {
                        /*we add this couple in the internal Stack */
@@ -581,7 +584,8 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
        if (*salt == NULL)
                {
                char *tmp_salt;
-               if ((tmp_salt = (char *)OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL)
+
+               if ((tmp_salt = OPENSSL_malloc(SRP_RANDOM_SALT_LEN * 2)) == NULL)
                        {
                        OPENSSL_free(vf);
                        goto err;