Recent changes from 0.9.6-stable

diff --git a/INSTALL.W32 b/INSTALL.W32
index 7c7cee4d5ef120c190d6b73da3cd1b4947c35f1b..0b4ec1f5d6ee6f40d8c393815d1abb3afe294808 100644 (file)
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -216,7 +216,7 @@
        $ md c:\openssl\lib
        $ md c:\openssl\include
        $ md c:\openssl\include\openssl
-       $ copy /b inc32\*               c:\openssl\include\openssl
+       $ copy /b inc32\openssl\*       c:\openssl\include\openssl
        $ copy /b out32dll\ssleay32.lib c:\openssl\lib
        $ copy /b out32dll\libeay32.lib c:\openssl\lib
        $ copy /b out32dll\ssleay32.dll c:\openssl\bin

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index d7bfc9345de6e2a4b9705f13dab4498b6018d455..5b9e0e3a5679001784a6b422ebaddd59d9f7177f 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -249,7 +249,7 @@ int MAIN(int argc, char **argv)
                }
                BIO_free(in);
                if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-                       BIO_printf(bio_err, "Error converting key\n", outfile);
+                       BIO_printf(bio_err, "Error converting key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
@@ -273,8 +273,7 @@ int MAIN(int argc, char **argv)
                        if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                        p8pass, strlen(p8pass),
                                        NULL, 0, iter, p8inf))) {
-                               BIO_printf(bio_err, "Error encrypting key\n",
-                                                                outfile);
+                               BIO_printf(bio_err, "Error encrypting key\n");
                                ERR_print_errors(bio_err);
                                return (1);
                        }
@@ -317,7 +316,7 @@ int MAIN(int argc, char **argv)
                }
 
                if (!p8) {
-                       BIO_printf (bio_err, "Error reading key\n", outfile);
+                       BIO_printf (bio_err, "Error reading key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
@@ -331,13 +330,13 @@ int MAIN(int argc, char **argv)
        }
 
        if (!p8inf) {
-               BIO_printf(bio_err, "Error decrypting key\n", outfile);
+               BIO_printf(bio_err, "Error decrypting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
 
        if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-               BIO_printf(bio_err, "Error converting key\n", outfile);
+               BIO_printf(bio_err, "Error converting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }

diff --git a/apps/x509.c b/apps/x509.c
index a9bc6835c9488bdd4cac50106425e7d514490deb..caa619e439d9677fb9d27fe2d5da6ac24f85c92d 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -1090,7 +1090,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
        BIO_free(io);
        io=NULL;
        
-       if (!X509_STORE_add_cert(ctx,x)) goto end;
+       /*if (!X509_STORE_add_cert(ctx,x)) goto end;*/
 
        /* NOTE: this certificate can/should be self signed, unless it was
         * a certificate request in which case it is not. */

diff --git a/crypto/md5/asm/md5-586.pl b/crypto/md5/asm/md5-586.pl
index 5fc6a205ce00af8843d1ec750d5397dd50567374..fa3fa3bed59c1685f6b3005d56bf3ac555d97fc9 100644 (file)
--- a/crypto/md5/asm/md5-586.pl
+++ b/crypto/md5/asm/md5-586.pl
@@ -293,7 +293,7 @@ sub md5_block
         &mov(&DWP(12,$tmp2,"",0),$D);
 
        &cmp($tmp1,$X) unless $normal;                  # check count
-        &jge(&label("start")) unless $normal;
+        &jae(&label("start")) unless $normal;
 
        &pop("eax"); # pop the temp variable off the stack
         &pop("ebx");

diff --git a/crypto/perlasm/x86ms.pl b/crypto/perlasm/x86ms.pl
index 206452341d1faf5c444be80d68282bb34f338d5d..9e39c692ac717660fff51036f7f5070a3e7033ec 100644 (file)
--- a/crypto/perlasm/x86ms.pl
+++ b/crypto/perlasm/x86ms.pl
@@ -141,7 +141,10 @@ sub main'jle       { &out1("jle",@_); }
 sub main'jz    { &out1("jz",@_); }
 sub main'jge   { &out1("jge",@_); }
 sub main'jl    { &out1("jl",@_); }
+sub main'ja    { &out1("ja",@_); }
+sub main'jae   { &out1("jae",@_); }
 sub main'jb    { &out1("jb",@_); }
+sub main'jbe   { &out1("jbe",@_); }
 sub main'jc    { &out1("jc",@_); }
 sub main'jnc   { &out1("jnc",@_); }
 sub main'jnz   { &out1("jnz",@_); }

diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index 519d8a5867287aa962648ba1990f37631d5a8d9d..b156a55cc73fd48499ccd6a6b1f1fd3384a29d6b 100644 (file)
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -149,7 +149,10 @@ sub main'jle       { &out1("jle NEAR",@_); }
 sub main'jz    { &out1("jz NEAR",@_); }
 sub main'jge   { &out1("jge NEAR",@_); }
 sub main'jl    { &out1("jl NEAR",@_); }
+sub main'ja    { &out1("ja NEAR",@_); }
+sub main'jae   { &out1("jae NEAR",@_); }
 sub main'jb    { &out1("jb NEAR",@_); }
+sub main'jbe   { &out1("jbe NEAR",@_); }
 sub main'jc    { &out1("jc NEAR",@_); }
 sub main'jnc   { &out1("jnc NEAR",@_); }
 sub main'jnz   { &out1("jnz NEAR",@_); }

diff --git a/crypto/perlasm/x86unix.pl b/crypto/perlasm/x86unix.pl
index 10a7af8bffd09fcda0bc8057ebb3254b4ef11c2b..1143459b3937c9acb47ad022f591fca35f3f6206 100644 (file)
--- a/crypto/perlasm/x86unix.pl
+++ b/crypto/perlasm/x86unix.pl
@@ -154,7 +154,10 @@ sub main'jnz       { &out1("jnz",@_); }
 sub main'jz    { &out1("jz",@_); }
 sub main'jge   { &out1("jge",@_); }
 sub main'jl    { &out1("jl",@_); }
+sub main'ja    { &out1("ja",@_); }
+sub main'jae   { &out1("jae",@_); }
 sub main'jb    { &out1("jb",@_); }
+sub main'jbe   { &out1("jbe",@_); }
 sub main'jc    { &out1("jc",@_); }
 sub main'jnc   { &out1("jnc",@_); }
 sub main'jno   { &out1("jno",@_); }

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 60c97ee62940c1766c55471121e2817bf1d916ec..b98b79840a24bc2fc1eb645eb02fea9b777b9294 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1608,6 +1608,7 @@ static int ssl3_send_client_verify(SSL *s)
                *(d++)=SSL3_MT_CERTIFICATE_VERIFY;
                l2n3(n,d);
 
+               s->state=SSL3_ST_CW_CERT_VRFY_B;
                s->init_num=(int)n+4;
                s->init_off=0;
                }

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 5eaab1daae22fd08e6f822182a28994d75090226..185eb64d2e5c22302008f8cd3e9bd1583100348b 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1338,6 +1338,7 @@ static int ssl3_send_certificate_request(SSL *s)
                s->init_num += 4;
 #endif
 
+               s->state = SSL3_ST_SW_CERT_REQ_B;
                }
 
        /* SSL3_ST_SW_CERT_REQ_B */