mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-06 15:58:39 +09:00
Update NSS to 3.35-RTM
This commit is contained in:
wolfbeast
Roy Tam
parent
fe49ad404e
commit
66dd670b60
388 changed files with 39075 additions and 20752 deletions
296
security/nss/lib/ssl/sslencode.c
Normal file
296
security/nss/lib/ssl/sslencode.c
Normal file
|
|
@ -0,0 +1,296 @@
|
|||
/* -*- 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 "nss.h"
|
||||
#include "prnetdb.h"
|
||||
#include "ssl.h"
|
||||
#include "sslimpl.h"
|
||||
|
||||
/* Helper function to encode an unsigned integer into a buffer. */
|
||||
static void
|
||||
ssl_EncodeUintX(PRUint8 *to, PRUint64 value, unsigned int bytes)
|
||||
{
|
||||
PRUint64 encoded;
|
||||
|
||||
PORT_Assert(bytes > 0 && bytes <= sizeof(encoded));
|
||||
|
||||
encoded = PR_htonll(value);
|
||||
PORT_Memcpy(to, ((unsigned char *)(&encoded)) + (sizeof(encoded) - bytes),
|
||||
bytes);
|
||||
}
|
||||
|
||||
/* Grow a buffer to hold newLen bytes of data. When used for recv/xmit buffers,
|
||||
* the caller must hold xmitBufLock or recvBufLock, as appropriate. */
|
||||
SECStatus
|
||||
sslBuffer_Grow(sslBuffer *b, unsigned int newLen)
|
||||
{
|
||||
if (b->fixed) {
|
||||
PORT_Assert(newLen <= b->space);
|
||||
if (newLen > b->space) {
|
||||
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
|
||||
return SECFailure;
|
||||
}
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
newLen = PR_MAX(newLen, b->len + 1024);
|
||||
if (newLen > b->space) {
|
||||
unsigned char *newBuf;
|
||||
if (b->buf) {
|
||||
newBuf = (unsigned char *)PORT_Realloc(b->buf, newLen);
|
||||
} else {
|
||||
newBuf = (unsigned char *)PORT_Alloc(newLen);
|
||||
}
|
||||
if (!newBuf) {
|
||||
return SECFailure;
|
||||
}
|
||||
b->buf = newBuf;
|
||||
b->space = newLen;
|
||||
}
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_Append(sslBuffer *b, const void *data, unsigned int len)
|
||||
{
|
||||
SECStatus rv = sslBuffer_Grow(b, b->len + len);
|
||||
if (rv != SECSuccess) {
|
||||
return SECFailure; /* Code already set. */
|
||||
}
|
||||
PORT_Memcpy(SSL_BUFFER_NEXT(b), data, len);
|
||||
b->len += len;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_AppendNumber(sslBuffer *b, PRUint64 v, unsigned int size)
|
||||
{
|
||||
SECStatus rv = sslBuffer_Grow(b, b->len + size);
|
||||
if (rv != SECSuccess) {
|
||||
return SECFailure;
|
||||
}
|
||||
ssl_EncodeUintX(SSL_BUFFER_NEXT(b), v, size);
|
||||
b->len += size;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_AppendVariable(sslBuffer *b, const PRUint8 *data, unsigned int len,
|
||||
unsigned int size)
|
||||
{
|
||||
PORT_Assert(size <= 4 && size > 0);
|
||||
if (len >= (1ULL << (8 * size))) {
|
||||
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
if (sslBuffer_Grow(b, b->len + len + size) != SECSuccess) {
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
ssl_EncodeUintX(SSL_BUFFER_NEXT(b), len, size);
|
||||
b->len += size;
|
||||
PORT_Memcpy(SSL_BUFFER_NEXT(b), data, len);
|
||||
b->len += len;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_AppendBuffer(sslBuffer *b, const sslBuffer *append)
|
||||
{
|
||||
return sslBuffer_Append(b, append->buf, append->len);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_AppendBufferVariable(sslBuffer *b, const sslBuffer *append,
|
||||
unsigned int size)
|
||||
{
|
||||
return sslBuffer_AppendVariable(b, append->buf, append->len, size);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
sslBuffer_Skip(sslBuffer *b, unsigned int size, unsigned int *savedOffset)
|
||||
{
|
||||
if (sslBuffer_Grow(b, b->len + size) != SECSuccess) {
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
if (savedOffset) {
|
||||
*savedOffset = b->len;
|
||||
}
|
||||
b->len += size;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
/* A common problem is that a buffer is used to construct a variable length
|
||||
* structure of unknown length. The length field for that structure is then
|
||||
* populated afterwards. This function makes this process a little easier.
|
||||
*
|
||||
* To use this, before encoding the variable length structure, skip the spot
|
||||
* where the length would be using sslBuffer_Skip(). After encoding the
|
||||
* structure, and before encoding anything else, call this function passing the
|
||||
* value returned from sslBuffer_Skip() as |at| to have the length inserted.
|
||||
*/
|
||||
SECStatus
|
||||
sslBuffer_InsertLength(sslBuffer *b, unsigned int at, unsigned int size)
|
||||
{
|
||||
unsigned int len;
|
||||
|
||||
PORT_Assert(b->len >= at + size);
|
||||
PORT_Assert(b->space >= at + size);
|
||||
len = b->len - (at + size);
|
||||
|
||||
PORT_Assert(size <= 4 && size > 0);
|
||||
if (len >= (1ULL << (8 * size))) {
|
||||
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
ssl_EncodeUintX(SSL_BUFFER_BASE(b) + at, len, size);
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
void
|
||||
sslBuffer_Clear(sslBuffer *b)
|
||||
{
|
||||
if (!b->fixed) {
|
||||
if (b->buf) {
|
||||
PORT_Free(b->buf);
|
||||
b->buf = NULL;
|
||||
}
|
||||
b->space = 0;
|
||||
}
|
||||
b->len = 0;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_ConsumeFromItem(SECItem *item, unsigned char **buf, unsigned int size)
|
||||
{
|
||||
if (size > item->len) {
|
||||
PORT_SetError(SEC_ERROR_BAD_DATA);
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
*buf = item->data;
|
||||
item->data += size;
|
||||
item->len -= size;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_ConsumeNumberFromItem(SECItem *item, PRUint32 *num, unsigned int size)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (size > item->len || size > sizeof(*num)) {
|
||||
PORT_SetError(SEC_ERROR_BAD_DATA);
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
*num = 0;
|
||||
for (i = 0; i < size; i++) {
|
||||
*num = (*num << 8) + item->data[i];
|
||||
}
|
||||
|
||||
item->data += size;
|
||||
item->len -= size;
|
||||
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* Append Handshake functions.
|
||||
* All these functions set appropriate error codes.
|
||||
* Most rely on ssl3_AppendHandshake to set the error code.
|
||||
**************************************************************************/
|
||||
#define MAX_SEND_BUF_LENGTH 32000 /* watch for 16-bit integer overflow */
|
||||
#define MIN_SEND_BUF_LENGTH 4000
|
||||
|
||||
SECStatus
|
||||
ssl3_AppendHandshake(sslSocket *ss, const void *void_src, unsigned int bytes)
|
||||
{
|
||||
unsigned char *src = (unsigned char *)void_src;
|
||||
int room = ss->sec.ci.sendBuf.space - ss->sec.ci.sendBuf.len;
|
||||
SECStatus rv;
|
||||
|
||||
PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss)); /* protects sendBuf. */
|
||||
|
||||
if (!bytes)
|
||||
return SECSuccess;
|
||||
if (ss->sec.ci.sendBuf.space < MAX_SEND_BUF_LENGTH && room < bytes) {
|
||||
rv = sslBuffer_Grow(&ss->sec.ci.sendBuf, PR_MAX(MIN_SEND_BUF_LENGTH,
|
||||
PR_MIN(MAX_SEND_BUF_LENGTH, ss->sec.ci.sendBuf.len + bytes)));
|
||||
if (rv != SECSuccess)
|
||||
return SECFailure; /* sslBuffer_Grow sets a memory error code. */
|
||||
room = ss->sec.ci.sendBuf.space - ss->sec.ci.sendBuf.len;
|
||||
}
|
||||
|
||||
PRINT_BUF(60, (ss, "Append to Handshake", (unsigned char *)void_src, bytes));
|
||||
rv = ssl3_UpdateHandshakeHashes(ss, src, bytes);
|
||||
if (rv != SECSuccess)
|
||||
return SECFailure; /* error code set by ssl3_UpdateHandshakeHashes */
|
||||
|
||||
while (bytes > room) {
|
||||
if (room > 0)
|
||||
PORT_Memcpy(ss->sec.ci.sendBuf.buf + ss->sec.ci.sendBuf.len, src,
|
||||
room);
|
||||
ss->sec.ci.sendBuf.len += room;
|
||||
rv = ssl3_FlushHandshake(ss, ssl_SEND_FLAG_FORCE_INTO_BUFFER);
|
||||
if (rv != SECSuccess) {
|
||||
return SECFailure; /* error code set by ssl3_FlushHandshake */
|
||||
}
|
||||
bytes -= room;
|
||||
src += room;
|
||||
room = ss->sec.ci.sendBuf.space;
|
||||
PORT_Assert(ss->sec.ci.sendBuf.len == 0);
|
||||
}
|
||||
PORT_Memcpy(ss->sec.ci.sendBuf.buf + ss->sec.ci.sendBuf.len, src, bytes);
|
||||
ss->sec.ci.sendBuf.len += bytes;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_AppendHandshakeNumber(sslSocket *ss, PRUint64 num, unsigned int lenSize)
|
||||
{
|
||||
PRUint8 b[sizeof(num)];
|
||||
SSL_TRC(60, ("%d: number:", SSL_GETPID()));
|
||||
ssl_EncodeUintX(b, num, lenSize);
|
||||
return ssl3_AppendHandshake(ss, b, lenSize);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_AppendHandshakeVariable(sslSocket *ss, const PRUint8 *src,
|
||||
unsigned int bytes, unsigned int lenSize)
|
||||
{
|
||||
SECStatus rv;
|
||||
|
||||
PORT_Assert((bytes < (1 << 8) && lenSize == 1) ||
|
||||
(bytes < (1L << 16) && lenSize == 2) ||
|
||||
(bytes < (1L << 24) && lenSize == 3));
|
||||
|
||||
SSL_TRC(60, ("%d: append variable:", SSL_GETPID()));
|
||||
rv = ssl3_AppendHandshakeNumber(ss, bytes, lenSize);
|
||||
if (rv != SECSuccess) {
|
||||
return SECFailure; /* error code set by AppendHandshake. */
|
||||
}
|
||||
SSL_TRC(60, ("data:"));
|
||||
return ssl3_AppendHandshake(ss, src, bytes);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_AppendBufferToHandshake(sslSocket *ss, sslBuffer *buf)
|
||||
{
|
||||
return ssl3_AppendHandshake(ss, buf->buf, buf->len);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
ssl3_AppendBufferToHandshakeVariable(sslSocket *ss, sslBuffer *buf,
|
||||
unsigned int lenSize)
|
||||
{
|
||||
return ssl3_AppendHandshakeVariable(ss, buf->buf, buf->len, lenSize);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue