0.6.2 release

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index ed61e24d16be5e556a527cfbfa80bc4f10e6beaa..49b91bfee2c5183cf0794ec187f4e451cf700621 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -13,8 +13,7 @@
  * 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>
@@ -22,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"
@@ -308,7 +306,7 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                                break;
                                        }
                                        curpacket->packet->length = 
-                                               (curchar << 24);
+                                               ((unsigned) curchar << 24);
                                        if (getchar_func(ctx, 1, &curchar)) {
                                                rc = ONAK_E_INVALID_PKT;
                                                break;
@@ -354,12 +352,62 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                } 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 -> v5 */
+                               if (curpacket->packet->data[0] < 2 ||
+                                       curpacket->packet->data[0] > 5) {
+                                       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);