* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
#include "mem.h"
struct openpgp_packet_list *curpacket = NULL, **packetend = NULL;
onak_status_t rc = ONAK_E_OK;
int keys = 0;
- bool inpacket = false;
if (packets == NULL)
return ONAK_E_INVALID_PARAM;
}
}
- while (!rc && (maxnum == 0 || keys < maxnum) &&
+ while (rc == ONAK_E_OK && (maxnum == 0 || keys < maxnum) &&
!getchar_func(ctx, 1, &curchar)) {
- if (!inpacket && (curchar & 0x80)) {
+ if (curchar & 0x80) {
/*
- * New packet. Record the fact we're in a packet and
- * allocate memory for it.
+ * New packet. Allocate memory for it.
*/
- inpacket = true;
if (curpacket != NULL) {
curpacket->next = malloc(sizeof (*curpacket));
packetend = &curpacket->next;
*/
if (curpacket->packet->newformat) {
curpacket->packet->tag = (curchar & 0x3F);
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length = curchar;
if (curpacket->packet->length > 191 &&
curpacket->packet->length < 224) {
* 5 byte length; ie 255 followed by 3
* bytes of MSB length.
*/
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length = curchar;
curpacket->packet->length <<= 8;
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length += curchar;
curpacket->packet->length <<= 8;
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length += curchar;
curpacket->packet->length <<= 8;
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length += curchar;
}
} else {
curpacket->packet->tag = (curchar & 0x3C) >> 2;
switch (curchar & 3) {
case 0:
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length = curchar;
break;
case 1:
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length = curchar;
curpacket->packet->length <<= 8;
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length += curchar;
break;
case 2:
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length =
- (curchar << 24);
- rc = getchar_func(ctx, 1, &curchar);
+ ((unsigned) curchar << 24);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length +=
(curchar << 16);
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length +=
(curchar << 8);
- rc = getchar_func(ctx, 1, &curchar);
+ if (getchar_func(ctx, 1, &curchar)) {
+ rc = ONAK_E_INVALID_PKT;
+ break;
+ }
curpacket->packet->length += curchar;
break;
case 3:
curpacket->packet->data);
}
}
- inpacket = false;
} else {
rc = ONAK_E_INVALID_PKT;
}
+ if (rc == ONAK_E_OK) {
+ /* Make sure the packet version is sane */
+ switch (curpacket->packet->tag) {
+ case OPENPGP_PACKET_ENCRYPTED_MDC:
+ /* These packets must be v1 */
+ if (curpacket->packet->data[0] != 1) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_PKSESSIONKEY:
+ case OPENPGP_PACKET_ONEPASSSIG:
+ /* These packets must be v3 */
+ if (curpacket->packet->data[0] != 3) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_SYMSESSIONKEY:
+ /* These packets must be v4 */
+ if (curpacket->packet->data[0] != 4) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_SIGNATURE:
+ case OPENPGP_PACKET_SECRETKEY:
+ case OPENPGP_PACKET_PUBLICKEY:
+ /* Must be v2 -> v4 */
+ if (curpacket->packet->data[0] < 2 ||
+ curpacket->packet->data[0] > 4) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ default:
+ break;
+ }
+ }
}
- /* Trim the last packet if it doesn't actually exist */
- if (packetend != NULL && (*packetend)->packet == NULL) {
- free(*packetend);
- *packetend = NULL;
+ if (packetend != NULL) {
+ if ((*packetend)->packet != NULL) {
+ /* If we got an invalid final packet, discard it. */
+ if ((*packetend)->packet->data != NULL &&
+ rc != ONAK_E_OK) {
+ free((*packetend)->packet->data);
+ (*packetend)->packet->data = NULL;
+ }
+ /* If we didn't get any data, clean it up. */
+ if ((*packetend)->packet->data == NULL) {
+ free((*packetend)->packet);
+ (*packetend)->packet = NULL;
+ }
+ }
+ /* Trim the last packet if it doesn't actually exist */
+ if ((*packetend)->packet == NULL) {
+ free(*packetend);
+ *packetend = NULL;
+ }
}
return (rc);
projects / onak.git / blobdiff