import openssl-0.9.7-beta1

1 files changed, 26 insertions, 83 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_vrf.c b/src/lib/libcrypto/dsa/dsa_vrf.c
index 0f860984ed..066c6b5b28 100644
--- a/src/lib/libcrypto/dsa/dsa_vrf.c
+++ b/src/lib/libcrypto/dsa/dsa_vrf.c
@@ -56,97 +56,40 @@
  * [including the GNU Public Licence.]
  */
 
-/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
+/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/engine.h>
+
+int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
+                  DSA *dsa)
+        {
+        return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
+        }
 
 /* data has already been hashed (probably with SHA or SHA-1). */
 /* returns
- *       1: correct signature
- *       0: incorrect signature
- *      -1: error
+ *      1: correct signature
+ *      0: incorrect signature
+ *     -1: error
  */
-int DSA_verify(type,dgst,dgst_len,sigbuf,siglen, dsa)
-int type;
-unsigned char *dgst;
-int dgst_len;
-unsigned char *sigbuf;
-int siglen;
-DSA *dsa;
+int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
+             const unsigned char *sigbuf, int siglen, DSA *dsa)
         {
-        /* The next 3 are used by the M_ASN1 macros */
-        long length=siglen;
-        ASN1_CTX c;
-        unsigned char **pp= &sigbuf;
-        BN_CTX *ctx;
-        BIGNUM *r=NULL;
-        BIGNUM *t1=NULL,*t2=NULL;
-        BIGNUM *u1=NULL,*u2=NULL;
-        ASN1_INTEGER *bs=NULL;
-        int ret = -1;
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        t1=BN_new();
-        t2=BN_new();
-        if (t1 == NULL || t2 == NULL) goto err;
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
-        if ((r=BN_bin2bn(bs->data,bs->length,NULL)) == NULL) goto err_bn;
-        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
-        if ((u1=BN_bin2bn(bs->data,bs->length,NULL)) == NULL) goto err_bn;
-        if (!asn1_Finish(&c)) goto err;
-
-        /* Calculate W = inv(S) mod Q
-         * save W in u2 */
-        if ((u2=BN_mod_inverse(u1,dsa->q,ctx)) == NULL) goto err_bn;
-
-        /* save M in u1 */
-        if (BN_bin2bn(dgst,dgst_len,u1) == NULL) goto err_bn;
-
-        /* u1 = M * w mod q */
-        if (!BN_mod_mul(u1,u1,u2,dsa->q,ctx)) goto err_bn;
-
-        /* u2 = r * w mod q */
-        if (!BN_mod_mul(u2,r,u2,dsa->q,ctx)) goto err_bn;
+        DSA_SIG *s;
+        int ret=-1;
 
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        if (!BN_mod_exp(t1,dsa->g,u1,dsa->p,ctx)) goto err_bn;
-        /* let t2 = y ^ u2 mod p */
-        if (!BN_mod_exp(t2,dsa->pub_key,u2,dsa->p,ctx)) goto err_bn;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(u1,t1,t2,dsa->p,ctx)) goto err_bn;
-        /* let u1 = u1 mod q */
-        if (!BN_mod(u1,u1,dsa->q,ctx)) goto err_bn;
-        /* V is now in u1.  If the signature is correct, it will be
-         * equal to R. */
-        ret=(BN_ucmp(u1, r) == 0);
-        if (0)
-                {
-err: /* ASN1 error */
-                DSAerr(DSA_F_DSA_VERIFY,c.error);
-                }
-        if (0)
-                {
-err_bn: /* BN error */
-                DSAerr(DSA_F_DSA_VERIFY,ERR_R_BN_LIB);
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (r != NULL) BN_free(r);
-        if (t1 != NULL) BN_free(t1);
-        if (t2 != NULL) BN_free(t2);
-        if (u1 != NULL) BN_free(u1);
-        if (u2 != NULL) BN_free(u2);
-        if (bs != NULL) ASN1_BIT_STRING_free(bs);
+        s = DSA_SIG_new();
+        if (s == NULL) return(ret);
+        if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err;
+        ret=DSA_do_verify(dgst,dgst_len,s,dsa);
+err:
+        DSA_SIG_free(s);
         return(ret);
         }