Version skew reduction.
authorBen Laurie <ben@openssl.org>
Wed, 6 Jun 2012 12:41:46 +0000 (12:41 +0000)
committerBen Laurie <ben@openssl.org>
Wed, 6 Jun 2012 12:41:46 +0000 (12:41 +0000)
crypto/ec/eck_prn.c
crypto/objects/objxref.pl
crypto/rsa/rsa_eay.c
ssl/s3_clnt.c

index 39ce97862dbd44dfa93db5a687d7731ffe33b1fd..45e0109bb6902e7d75912408e76c99e9e12d47af 100644 (file)
@@ -185,6 +185,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                nid = EC_GROUP_get_curve_name(x);
                if (nid == 0)
                        goto err;
+
                if (BIO_printf(bp, "ASN1 OID: %s", OBJ_nid2sn(nid)) <= 0)
                        goto err;
                if (BIO_printf(bp, "\n") <= 0)
index 94b9bc133f684dd90b246c6cff12eea5bf6e3f15..731d3ae22c2745928648f0602ba2732c292a9b7e 100644 (file)
@@ -39,8 +39,7 @@ my @xrkeys = keys %xref_tbl;
 
 my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
 
-my $i;
-for($i = 0; $i <= $#srt1; $i++)
+for(my $i = 0; $i <= $#srt1; $i++)
        {
        $xref_tbl{$srt1[$i]}[2] = $i;
        }
index aff14f3ba51131cffe1424315fd3fd271daf68c9..88ee2cb557f0130e3031734d6e5855dc964560dd 100644 (file)
@@ -598,9 +598,9 @@ static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
                r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);
                break;
 #ifndef OPENSSL_NO_SHA
-       case RSA_PKCS1_OAEP_PADDING:
-           r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
-               break;
+        case RSA_PKCS1_OAEP_PADDING:
+               r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
+                break;
 #endif
        case RSA_SSLV23_PADDING:
                r=RSA_padding_check_SSLv23(to,num,buf,j,num);
index 04de0977336bb909eb7eaa02bc5d77d3f117a581..0acaca5a123953d2ef64c64f3997e26ff8235adb 100644 (file)
@@ -1263,6 +1263,7 @@ int ssl3_get_server_certificate(SSL *s)
 
 #endif
        ret=1;
+
        if (0)
                {
 f_err: