diff options
| author | Ben Laurie <ben@openssl.org> | 2012-06-06 12:41:46 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2012-06-06 12:41:46 +0000 |
| commit | ff46820da676c7971e82025b6b0038e1082bc1fe (patch) | |
| tree | 1be96f9492682cdd8c8293f4f7ce6f7c3aa9c42f | |
| parent | 6fba65e20ddac1545e7fc45ab2fe3495b99d3ab8 (diff) | |
Version skew reduction.
| -rw-r--r-- | crypto/ec/eck_prn.c | 1 | ||||
| -rw-r--r-- | crypto/objects/objxref.pl | 3 | ||||
| -rw-r--r-- | crypto/rsa/rsa_eay.c | 6 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c index 39ce97862d..45e0109bb6 100644 --- a/crypto/ec/eck_prn.c +++ b/crypto/ec/eck_prn.c @@ -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) diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl index 94b9bc133f..731d3ae22c 100644 --- a/crypto/objects/objxref.pl +++ b/crypto/objects/objxref.pl @@ -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; } diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index aff14f3ba5..88ee2cb557 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -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); diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 04de097733..0acaca5a12 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -1263,6 +1263,7 @@ int ssl3_get_server_certificate(SSL *s) #endif ret=1; + if (0) { f_err: |