Update color handling code to separate top/botom and allow 1b[0m

diff --git a/source/firm/firm.c b/source/firm/firm.c
index 622e8d4857e98207b3e27f0ba5e2cc8ec662e64a..69900d6be7141a6d3b2d4f586dceec2cacd776f0 100644 (file)
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@ -36,52 +36,6 @@ void slot0x11key96_init()
     // Otherwise, we make sure the error message for decrypting arm9bin mentions this.
 }
 
-int decrypt_cetk_key(void *key, const void *cetk)
-{
-    // This function only decrypts the NATIVE_FIRM CETK.
-    // I don't need it for anything else atm.
-    // Either way, this is the reason for the two checks here at the top.
-
-    static int common_key_y_init = 0;
-    uint8_t iv[AES_BLOCK_SIZE] = {0};
-
-    uint32_t sigtype = __builtin_bswap32(*(uint32_t *)cetk);
-    if (sigtype != SIG_TYPE_RSA2048_SHA256) return 1;
-
-    ticket_h *ticket = (ticket_h *)(cetk + sizeof(sigtype) + 0x13C);
-    if (ticket->ticketCommonKeyYIndex != 1) return 1;
-
-    if (!common_key_y_init) {
-        uint8_t common_key_y[AES_BLOCK_SIZE] = {0};
-        uint8_t *p9_base = (uint8_t *)0x08028000;
-        uint8_t *i;
-        for (i = p9_base + 0x70000 - AES_BLOCK_SIZE; i >= p9_base; i--) {
-            if (i[0] == 0xD0 && i[4] == 0x9C && i[8] == 0x32 && i[12] == 0x23) {
-                // At i, there's 7 keys with 4 bytes padding between them.
-                // We only need the 2nd.
-                memcpy(common_key_y, i + AES_BLOCK_SIZE + 4, sizeof(common_key_y));
-                fprintf(BOTTOM_SCREEN, "Found the common key Y\n");
-
-                break;
-            }
-        }
-        if (i < p9_base) return 1;
-
-        aes_setkey(0x3D, common_key_y, AES_KEYY, AES_INPUT_BE | AES_INPUT_NORMAL);
-        common_key_y_init = 1;
-    }
-
-    aes_use_keyslot(0x3D);
-
-    memcpy(iv, ticket->titleID, sizeof(ticket->titleID));
-
-    fprintf(BOTTOM_SCREEN, "Decrypting key\n");
-    memcpy(key, ticket->titleKey, sizeof(ticket->titleKey));
-    aes(key, key, 1, iv, AES_CBC_DECRYPT_MODE, AES_INPUT_BE | AES_INPUT_NORMAL);
-
-    return 0;
-}
-
 int decrypt_firm_title(firm_h *dest, ncch_h *ncch, uint32_t *size, void *key)
 {
     uint8_t firm_iv[16] = {0};
@@ -159,21 +113,8 @@ int decrypt_firm(firm_h *dest, char *path_firmkey, char *path_cetk, uint32_t *si
 
     // Firmware is likely encrypted. Decrypt.
     if (!read_file(firm_key, path_firmkey, AES_BLOCK_SIZE)) {
-        fprintf(BOTTOM_SCREEN, "Failed to load FIRM key,\n"
-                               "  Attempting to generate with CETK.\n");
-
-        if (!read_file(fcram_temp, path_cetk, FCRAM_SPACING)) {
-            fprintf(BOTTOM_SCREEN, "Failed to load CETK\n");
-            return 1;
-        }
-        fprintf(BOTTOM_SCREEN, "Loaded CETK\n");
-
-        if (decrypt_cetk_key(firm_key, fcram_temp) != 0) {
-            fprintf(BOTTOM_SCREEN, "Failed to decrypt the CETK\n");
-            return 1;
-        }
-        fprintf(BOTTOM_SCREEN, "Saving FIRM key for future use\n");
-        write_file(firm_key, path_firmkey, AES_BLOCK_SIZE);
+        fprintf(BOTTOM_SCREEN, "Failed to load FIRM key\n");
+        return 1;
     } else {
         fprintf(BOTTOM_SCREEN, "Loaded FIRM key\n");
     }

diff --git a/source/main.c b/source/main.c
index df54ec418137b1896f3185f20a953bc1a3b86d1d..b95a1e8f73b108dd1dad079e11df8e58b1cb6f65 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -32,7 +32,7 @@ uint32_t wait_key() {
 }
 
 void header() {
-    fprintf(stdout, "\x1b[33;40m[.corbenik//%s]\n", VERSION);
+    fprintf(stdout, "\x1b[33;40m[.corbenik//%s]\x1b[0m\n", VERSION);
 }
 
 int menu_options() { return MENU_MAIN; }
@@ -114,7 +114,7 @@ int menu_main() {
 
     for(int i=0; i < menu_max; i++) {
         if (cursor_y == i)
-            fprintf(TOP_SCREEN, "\x1b[32m>>   ");
+            fprintf(TOP_SCREEN, "\x1b[32m>>\x1b[0m   ");
         else
             fprintf(TOP_SCREEN, "   ");
         fprintf(TOP_SCREEN, "%s\n", list[i]);

diff --git a/source/std/draw.c b/source/std/draw.c
index 081916767fe21b3a23467d5579fb890085b5247e..35ece252290e0fbe618c0ae4cbcb48d20a82a3da 100644 (file)
--- a/source/std/draw.c
+++ b/source/std/draw.c
@@ -123,7 +123,10 @@ void draw_character(uint8_t* screen, const char character, const unsigned int bu
     }
 }
 
-void putc(void* buf, unsigned char color, const int c) {
+unsigned char color_top = 0xf0;
+unsigned char color_bottom = 0xf0;
+
+void putc(void* buf, const int c) {
     if ((int)buf == stdout || (int)buf == stderr) {
                unsigned int width  = 0;
                unsigned int height = 0;
@@ -133,6 +136,8 @@ void putc(void* buf, unsigned char color, const int c) {
        char* colorbuf;
        char* strbuf;
 
+               unsigned char* color = NULL;
+
                if ((int)buf == TOP_SCREEN) {
                        width    = TEXT_TOP_WIDTH;
                        height   = TEXT_TOP_HEIGHT;
@@ -141,6 +146,7 @@ void putc(void* buf, unsigned char color, const int c) {
            strbuf   = text_buffer_top;
            cursor_x = top_cursor_x;
            cursor_y = top_cursor_y;
+                       color = &color_top;
                } else if ((int)buf == BOTTOM_SCREEN) {
                        width    = TEXT_BOTTOM_WIDTH;
                        height   = TEXT_BOTTOM_HEIGHT;
@@ -149,6 +155,7 @@ void putc(void* buf, unsigned char color, const int c) {
                strbuf   = text_buffer_bottom;
                cursor_x = bottom_cursor_x;
                cursor_y = bottom_cursor_y;
+                       color = &color_bottom;
                }
 
                unsigned int offset = width * cursor_y + cursor_x;
@@ -177,7 +184,7 @@ void putc(void* buf, unsigned char color, const int c) {
                    break;
                default:
                    strbuf[offset] = c;
-                   colorbuf[offset] = color; // White on black.
+                   colorbuf[offset] = *color; // White on black.
                    cursor_x++;
                    if (cursor_x >= width) {
                        cursor_y++;
@@ -199,16 +206,16 @@ void putc(void* buf, unsigned char color, const int c) {
        }
 }
 
-void puts(void* buf, unsigned char color, const char *string) {
+void puts(void* buf, const char *string) {
     char *ref = (char*)string;
 
     while(*ref != '\0') {
-        putc(buf, color, *ref);
+        putc(buf, *ref);
         ref++;
     }
 }
 
-void put_int64(void* channel, unsigned char color, int64_t n, int length) {
+void put_int64(void* channel, int64_t n, int length) {
     char conv[32], out[32];
     memset(conv, 0, 32);
     memset(out, 0, 32);
@@ -234,10 +241,10 @@ void put_int64(void* channel, unsigned char color, int64_t n, int length) {
     for(int i=0; i < len; i++)
         out[i] = conv[(len-1) - i];
 
-    puts(channel, color, out);
+    puts(channel, out);
 }
 
-void put_uint64(void* channel, unsigned char color, uint64_t n, int length) {
+void put_uint64(void* channel, uint64_t n, int length) {
     char conv[32], out[32];
     memset(conv, 0, 32);
     memset(out, 0, 32);
@@ -254,15 +261,15 @@ void put_uint64(void* channel, unsigned char color, uint64_t n, int length) {
     for(int i=0; i < len; i++)
         out[i] = conv[(len-1) - i];
 
-    puts(channel, color, out);
+    puts(channel, out);
 }
 
-void put_uint(void* channel, unsigned char color, unsigned int n, int length) {
-    put_uint64(channel, color, n, length);
+void put_uint(void* channel, unsigned int n, int length) {
+    put_uint64(channel, n, length);
 }
 
-void put_int(void* channel, unsigned char color, int n, int length) {
-    put_int64(channel, color, n, length);
+void put_int(void* channel, int n, int length) {
+    put_int64(channel, n, length);
 }
 
 void fflush(void* channel) {
@@ -280,7 +287,7 @@ void fflush(void* channel) {
                        for(int y=0; y < TEXT_BOTTOM_HEIGHT; y++) {
                char c = text_buffer_bottom[y*TEXT_BOTTOM_WIDTH+x];
                uint32_t color_fg = colors[((color_buffer_bottom[y*TEXT_BOTTOM_WIDTH+x] >> 4) & 0x0f)];
-               uint32_t color_bg = colors[(color_buffer_top[y*TEXT_TOP_WIDTH+x] & 0x0f)];
+               uint32_t color_bg = colors[(color_buffer_bottom[y*TEXT_BOTTOM_WIDTH+x] & 0x0f)];
                                draw_character(framebuffers->bottom, c, x, y, color_fg, color_bg);
                        }
                }
@@ -294,7 +301,12 @@ void fprintf(void* channel, const char* format, ...) {
     va_start( ap, format );
 
     char *ref = (char*)format;
-    unsigned char color = 0xf0;
+
+       unsigned char* color;
+       if ((int)channel == TOP_SCREEN)
+               color = &color_top;
+       else if ((int)channel == TOP_SCREEN)
+               color = &color_bottom;
 
     while(*ref != '\0') {
                if (*ref == 0x1B && *(++ref) == '[' && ( (int)channel == stdout || (int)channel == stderr) ) {
@@ -306,8 +318,8 @@ ansi_codes:
                 ++ref;
                 if(*ref >= '0' && *ref <= '7') {
                     // Valid FG color.
-                    color &= 0x0f; // Remove fg color.
-                    color |= (*ref - '0') << 4;
+                    *color &= 0x0f; // Remove fg color.
+                    *color |= (*ref - '0') << 4;
                 }
             }
             // [40-47] Set bg color
@@ -315,10 +327,13 @@ ansi_codes:
                 ++ref;
                 if(*ref >= '0' && *ref <= '7') {
                     // Valid BG color.
-                    color &= 0xf0; // Remove bg color.
-                    color |= *ref - '0';
+                    *color &= 0xf0; // Remove bg color.
+                    *color |= *ref - '0';
                 }
-            }
+            } else if (*ref == '0') {
+                               // Reset.
+                               *color = 0xf0;
+                       }
 
             ++ref;
 
@@ -338,34 +353,34 @@ check_format:
                 case 'd':
                     switch(type_size) {
                         case 2:
-                            put_int64(channel, color, va_arg( ap, int64_t ), length);
+                            put_int64(channel, va_arg( ap, int64_t ), length);
                             break;
                         default:
-                            put_int(channel, color, va_arg( ap, int ), length);
+                            put_int(channel, va_arg( ap, int ), length);
                             break;
                     }
                     break;
                 case 'u':
                     switch(type_size) {
                         case 2:
-                            put_uint64(channel, color, va_arg( ap, uint64_t ), length);
+                            put_uint64(channel, va_arg( ap, uint64_t ), length);
                             break;
                         default:
-                            put_uint(channel, color, va_arg( ap, unsigned int ), length);
+                            put_uint(channel, va_arg( ap, unsigned int ), length);
                             break;
                     }
                     break;
                 case 's':
-                    puts(channel, color, va_arg( ap, char* ));
+                    puts(channel, va_arg( ap, char* ));
                     break;
                 case 'c':
-                    putc(channel, color, va_arg( ap, int ));
+                    putc(channel, va_arg( ap, int ));
                     break;
                 case 'p':
-                    color = va_arg( ap, unsigned int );
+                    puts(channel, va_arg( ap, char* ));
                     break;
                 case '%':
-                    putc(channel, color, '%');
+                    putc(channel, '%');
                     break;
                 case 'h':
                     goto check_format; // Integers get promoted. No point here.
@@ -380,7 +395,7 @@ check_format:
                     break;
             }
         } else {
-            putc(channel, color, *ref);
+            putc(channel, *ref);
         }
         ++ref;
     }

diff --git a/source/std/draw.h b/source/std/draw.h
index be36d3700ed849b30aefaa6ec555e11d70212a1c..df9086344880f264f863915a7e289a1f194231be 100644 (file)
--- a/source/std/draw.h
+++ b/source/std/draw.h
@@ -54,8 +54,8 @@ void draw_character(uint8_t* screen, const char character, const unsigned int po
 #define stdout TOP_SCREEN
 #define stderr BOTTOM_SCREEN
 
-void putc(void* buf, unsigned char color, const int c);
-void puts(void* buf, unsigned char color, const char *string);
+void putc(void* buf, const int c);
+void puts(void* buf, const char *string);
 void fflush(void* channel);
 
 void set_cursor(int channel, unsigned int x, unsigned int y);
@@ -91,6 +91,6 @@ void fprintf(void* channel, const char* format, ...);
 #define YELLOW    14
 #define WHITE     15
 
-#define COLOR(fg, bg) (((fg & 0x0f) << 4) | (bg & 0x0f))
+#define COLOR(fg, bg) "\x1b[3" #fg ";4" #bg "m"
 
 #endif