Commit 9458530d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0-stable

parent 9de014a7

engines/ccgost/gost_crypt.c

+8 −0
Original line number Diff line number Diff line
@@ -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;

ssl/d1_pkt.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

		}