From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 1 Jul 2009 11:29:25 +0000 (+0000)
Subject: Update from 1.0.0-stable
X-Git-Tag: OpenSSL-fips-2_0-rc1~1613
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9458530d450e80637c17d5a984ded8f0e4e0fa33;p=oweals%2Fopenssl.git

Update from 1.0.0-stable
---

diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index 954d150e51..39bb696446 100644
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -390,6 +390,14 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx,int type,int arg,void *ptr)
 			}
 		break;
 		}
+		case EVP_CTRL_PBE_PRF_NID:
+			if (ptr) {
+				*((int *)ptr)=  NID_id_HMACGostR3411_94;
+				return 1;
+			} else {
+				return 0;
+			}	
+				
 		default:
 			GOSTerr(GOST_F_GOST_CIPHER_CTL,GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);
 			return -1;
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 394daf6258..35e83d8b52 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -623,6 +623,7 @@ again:
 		/* this packet contained a partial record, dump it */
 		if ( n != i)
 			{
+			rr->length = 0;
 			s->packet_length = 0;
 			goto again;
 			}
@@ -636,6 +637,7 @@ again:
 	bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch);
 	if ( bitmap == NULL)
 		{
+		rr->length = 0;
 		s->packet_length = 0;  /* dump this record */
 		goto again;   /* get another record */
 		}
@@ -660,6 +662,7 @@ again:
 		{
 		dtls1_record_bitmap_update(s, bitmap);
 		dtls1_buffer_record(s, &(s->d1->unprocessed_rcds), rr->seq_num);
+		rr->length = 0;
 		s->packet_length = 0;
 		goto again;
 		}