Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Bug 1295163 - Limit time-variation when accepting 0-RTT, r=ekr
--HG-- branch : NSS_TLS13_DRAFT19_BRANCH extra : rebase_source : 6d7b1f33b0da396706a01dedc0142868d727daf4
- Loading branch information
1 parent
8fcd1d4
commit f077d65
Showing
20 changed files
with
351 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
/* | ||
* This file is PRIVATE to SSL. | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
#include "prnetdb.h" | ||
#include "seccomon.h" | ||
#include "secerr.h" | ||
#include "ssl3encode.h" | ||
|
||
SECStatus | ||
ssl3_AppendToItem(SECItem *item, const unsigned char *buf, PRUint32 bytes) | ||
{ | ||
if (bytes > item->len) { | ||
PORT_SetError(SEC_ERROR_INVALID_ARGS); | ||
return SECFailure; | ||
} | ||
|
||
PORT_Memcpy(item->data, buf, bytes); | ||
item->data += bytes; | ||
item->len -= bytes; | ||
return SECSuccess; | ||
} | ||
|
||
SECStatus | ||
ssl3_AppendNumberToItem(SECItem *item, PRUint64 num, PRInt32 lenSize) | ||
{ | ||
SECStatus rv; | ||
PRUint8 b[sizeof(num)]; | ||
|
||
ssl_EncodeUintX(num, lenSize, b); | ||
rv = ssl3_AppendToItem(item, &b[0], lenSize); | ||
return rv; | ||
} | ||
|
||
SECStatus | ||
ssl3_ConsumeFromItem(SECItem *item, unsigned char **buf, PRUint32 bytes) | ||
{ | ||
if (bytes > item->len) { | ||
PORT_SetError(SEC_ERROR_BAD_DATA); | ||
return SECFailure; | ||
} | ||
|
||
*buf = item->data; | ||
item->data += bytes; | ||
item->len -= bytes; | ||
return SECSuccess; | ||
} | ||
|
||
SECStatus | ||
ssl3_ConsumeNumberFromItem(SECItem *item, PRUint32 *num, PRUint32 bytes) | ||
{ | ||
int i; | ||
|
||
if (bytes > item->len || bytes > sizeof(*num)) { | ||
PORT_SetError(SEC_ERROR_BAD_DATA); | ||
return SECFailure; | ||
} | ||
|
||
*num = 0; | ||
for (i = 0; i < bytes; i++) { | ||
*num = (*num << 8) + item->data[i]; | ||
} | ||
|
||
item->data += bytes; | ||
item->len -= bytes; | ||
|
||
return SECSuccess; | ||
} | ||
|
||
/* Helper function to encode an unsigned integer into a buffer. */ | ||
PRUint8 * | ||
ssl_EncodeUintX(PRUint64 value, unsigned int bytes, PRUint8 *to) | ||
{ | ||
PRUint64 encoded; | ||
|
||
PORT_Assert(bytes > 0 && bytes <= sizeof(encoded)); | ||
|
||
encoded = PR_htonll(value); | ||
memcpy(to, ((unsigned char *)(&encoded)) + (sizeof(encoded) - bytes), bytes); | ||
return to + bytes; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
/* | ||
* This file is PRIVATE to SSL. | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
#ifndef __ssl3encode_h_ | ||
#define __ssl3encode_h_ | ||
|
||
#include "seccomon.h" | ||
|
||
/* All of these functions modify the underlying SECItem, and so should | ||
* be performed on a shallow copy.*/ | ||
SECStatus ssl3_AppendToItem(SECItem *item, | ||
const unsigned char *buf, PRUint32 bytes); | ||
SECStatus ssl3_AppendNumberToItem(SECItem *item, | ||
PRUint64 num, PRInt32 lenSize); | ||
SECStatus ssl3_ConsumeFromItem(SECItem *item, | ||
unsigned char **buf, PRUint32 bytes); | ||
SECStatus ssl3_ConsumeNumberFromItem(SECItem *item, | ||
PRUint32 *num, PRUint32 bytes); | ||
PRUint8 *ssl_EncodeUintX(PRUint64 value, unsigned int bytes, PRUint8 *to); | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.