1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 5042 5043 5044 5045 5046 5047 5048 5049 5050 5051 5052 5053 5054 5055 5056 5057 5058 5059 5060 5061 5062 5063 5064 5065 5066 5067 5068 5069 5070 5071 5072 5073 5074 5075 5076 5077 5078 5079 5080 5081 5082 5083 5084 5085 5086 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208 5209 5210 5211 5212 5213 5214 5215 5216 5217 5218 5219 5220 5221 5222 5223 5224 5225 5226 5227 5228 5229 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 5245 5246 5247 5248 5249 5250 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 5336 5337 5338 5339 5340 5341 5342 5343 5344 5345 5346 5347 5348 5349 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 5365 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 5418 5419 5420 5421 5422 5423 5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 5440 5441 5442 5443 5444 5445 5446 5447 5448 5449 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 5586 5587 5588 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 5963 5964 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 5998 5999 6000 6001 6002 6003 6004 6005 6006 6007 6008 6009 6010 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 6381 6382 6383 6384 6385 6386 6387 6388 6389 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 6478 6479 6480 6481 6482 6483 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 6502 6503 6504 6505 6506 6507 6508
|
commit 7b07684ea6698d4885ff2062350ad8798a04de42
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Aug 11 10:57:29 2021 +0200
NEWS: prepare for 2.8.1
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
NEWS | 8 ++++++++
1 file changed, 8 insertions(+)
commit 2f7a067ed64ce48095b3dc56bad3c45e17c4d34c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 12 18:01:39 2021 +0200
Makefile: Add missing files for tests and clean outstanding ones
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
commit a3801ff3d73f0158e656453b7df958acdddbe03f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 12 16:29:53 2021 +0200
Package fuzzer inputs and db symlink for meson tests to pass
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
commit 945c25c82bdba0737362caf39a31f58d857e206a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 12 15:03:46 2021 +0200
common: Fix build with glib < 2.68
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/common.c | 1 +
1 file changed, 1 insertion(+)
commit 21649747849c464cc8e67b832d1d5582e66eaee8
Author: Frediano Ziglio <freddy77@gmail.com>
Date: Thu Aug 12 12:31:58 2021 +0100
Fix issue using g_memdup2
Due to the way Autoconf works you cannot reuse PKG_CHECK_MODULES
for the same library so the compilation failed on some systems.
Check using just code and defines instead of using configuration
software.
Also avoids macros to avoid side effects.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
configure.ac | 9 +--------
meson.build | 12 +++---------
src/common.c | 14 ++++++++++++++
src/common.h | 7 +++----
src/vcard_emul_nss.c | 1 +
5 files changed, 22 insertions(+), 21 deletions(-)
commit 9c40d3b5a65e5d2f5244085061e3c96a6142ecea
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 12 12:18:50 2021 +0200
ci: Add Ubuntu 16.04 for old glib
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 8 ++++++++
1 file changed, 8 insertions(+)
commit a37e7bb2b00131b87124c1895a6525ea6eb52516
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Aug 3 16:30:46 2021 +0200
Use g_memdup2 if available and fallback if not
configure.ac | 9 ++++++++-
meson.build | 12 +++++++++---
src/cac.c | 2 +-
src/card_7816.c | 2 +-
src/common.h | 6 ++++++
src/simpletlv.c | 4 ++--
src/vcard.c | 5 +++--
src/vcard_emul_nss.c | 5 +++--
src/vscclient.c | 2 +-
9 files changed, 34 insertions(+), 13 deletions(-)
commit cf6121deb47e437aa566cfeb29a03da93c432394
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jan 4 18:15:53 2021 +0100
meson: avoid unknown variable softhsm warning when missing test dependencies
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <freddy77@gmail.com>
tests/meson.build | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
commit c75dc5f3036bf51120367b4d5fd6b442989b1dc1
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jan 4 10:54:39 2021 +0100
Supress memory leak from NSS system policy
It is suppressed also by using NSS_IGNORE_SYSTEM_POLICY=1 but we want to run
as closely as possible to existing systems so we rather supress it. The leak
did not have very useful trace, but from code review it was certainly related
to the system policy in NSS.
==6995==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 4097 byte(s) in 1 object(s) allocated from:
#0 0x7f973a3c33cf in __interceptor_malloc (/lib64/libasan.so.6+0xab3cf)
#1 0x7f973a35b4b8 (/lib64/libasan.so.6+0x434b8)
#2 0x7f9735bc47dd (<unknown module>)
#3 0x7f9735bc9338 (<unknown module>)
#4 0x7f9735bcd149 (<unknown module>)
#5 0x7f973a03316a (/lib64/libnss3.so+0x4616a)
#6 0x7f973a03ffbc in SECMOD_LoadModule (/lib64/libnss3.so+0x52fbc)
#7 0x7f973a0400f7 in SECMOD_LoadModule (/lib64/libnss3.so+0x530f7)
#8 0x7f973a009820 (/lib64/libnss3.so+0x1c820)
#9 0x7f973a009d9b in NSS_InitContext (/lib64/libnss3.so+0x1cd9b)
#10 0x7f973a2ffc3f in vcard_emul_init (/builds/jjelen/libcacard/.libs/libcacard.so.0+0x21c3f)
#11 0x40eed3 in libcacard_init (/builds/jjelen/libcacard/tests/.libs/lt-libcacard+0x40eed3)
#12 0x41b2c1 in main (/builds/jjelen/libcacard/tests/.libs/lt-libcacard+0x41b2c1)
#13 0x7f9739d9d1a1 in __libc_start_main (/lib64/libc.so.6+0x281a1)
#14 0x40258d in _start (/builds/jjelen/libcacard/tests/.libs/lt-libcacard+0x40258d)
SUMMARY: AddressSanitizer: 4097 byte(s) leaked in 1 allocation(s).
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
suppr.txt | 1 +
1 file changed, 1 insertion(+)
commit 4e1e4aebf384d2afcfb958c23f87db26de1495c1
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 15:15:19 2020 +0100
tests: Implement decipher test to execute missing use case
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/common.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/common.h | 2 ++
tests/db.crypt | Bin 0 -> 256 bytes
tests/hwtests.c | 28 +++++++++++++++++
tests/libcacard.c | 18 +++++++++++
tests/setup-softhsm2.sh | 5 +++
6 files changed, 134 insertions(+)
commit 371b8841032a5c6db2c97c1aec9e3428a063209e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 18:01:01 2020 +0100
tests: Temporarily generate only one key
This helps making sure we use for deciphering the same key that
was used for encrypting the plaintext as we can not affect the
ordering of the keys coming from softhsm to libcacard in any
simple way.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/setup-softhsm2.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit aca849bee8b64d3c83a7bcc57b12b1ced76ae5ac
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 15:12:59 2020 +0100
tests: Fix comments
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/common.c | 2 +-
tests/hwtests.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit ae68776db9a6097cd6307befc74d4eec00cc55da
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 15:12:30 2020 +0100
tests: Fix ofset calculation while reading buffers
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/common.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 323defeef280bf2de63d6b5dcdfc13ab7ed9ff4b
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Oct 29 16:23:34 2020 +0100
vcard_emul_nss: Fix RAW deciphering emulation using PKCS1 method
This reverts the commit c3838328 which technically made this
code dead code.
I got a clarifiction from Bob, that the code was wrong, including
the assert, which caused a lot of confusion in the past.
Fixes #25
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
commit 8676f404a2284a7638717e59da0d1921e3e688b8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Oct 7 21:09:52 2020 +0200
Run fuzzers as part of CI at least with example inputs
This helps to catch errors earlier than in oss-fuzz and avoids
0% code coverages of fuzzers when generated by meson.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/corpora/fuzz_options/test | 1 +
fuzz/corpora/fuzz_simpletlv/test | Bin 0 -> 1022 bytes
fuzz/corpora/fuzz_xfer/test | Bin 0 -> 443 bytes
fuzz/db | 1 +
fuzz/fuzz_xfer.c | 23 +++++++----------------
fuzz/meson.build | 10 +++++++++-
6 files changed, 18 insertions(+), 17 deletions(-)
commit 98b626ec8cbe1d12b302a5e84f7b9eabeff0960a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Oct 7 15:07:24 2020 +0200
Readme: Update link to the coverage report
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 15e621d8d520fe508efdbdd054d2363082137647
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Oct 7 14:29:17 2020 +0200
test: Run hwtests with token not supporting raw RSA signatures
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/meson.build | 10 ++++++++++
tests/setup-softhsm2.sh | 9 +++++++++
2 files changed, 19 insertions(+)
commit b2aa029c86ca155b19e6b799306335d6b8329d70
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Oct 7 13:50:58 2020 +0200
Improve non-deterministic test to have lower chance to fail
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/gp.c | 5 +++--
tests/common.c | 11 +++++------
2 files changed, 8 insertions(+), 8 deletions(-)
commit b298538fecaa48dd15af295cf962c28ed2ef21f7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 17:52:31 2020 +0100
gitlab-ci: Try to report results in junit format
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
commit 740f95857eaffbc3dfa8e0762f0836f16a4b4efc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Oct 30 15:43:58 2020 +0100
gitlab-ci: Upload artifacts always (not on success, which is default)
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 2038639a361fb8fcc32087f9c631b77e37b23a51
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Oct 7 15:06:01 2020 +0200
gitlab-ci: Let meson generate coverage reports
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
commit 3c29cd10b211e81e79f38f4c0a9d42070a382789
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Oct 6 17:36:28 2020 +0200
test: Add 32b paths for softhsm
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/setup-softhsm2.sh | 1 +
1 file changed, 1 insertion(+)
commit e47664f097f5328d01a6c36d3e11577d6445b3b4
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 22 18:50:16 2020 +0200
Document release process
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
docs/how_to_release.md | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
commit 92260db57406b081712aaf2bc165e9790433dd64
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 14:43:53 2020 +0200
Package also meson build files using autotools
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Makefile.am | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit 92a1a7cdb05a3f47597de4308cf220814543e38c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 13:42:51 2020 +0200
Install missing dependencies in CI
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 00a04b6a8d45c5e72a3ac3208f454ff2d3efe47f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 13:01:02 2020 +0200
Do not reference .travis-ci.yml anymore for meson build
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
build-aux/meson-dist | 1 -
1 file changed, 1 deletion(-)
commit ca3ec20ec49f664116e92078e19f4e8de0347556
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 12:49:41 2020 +0200
Remove unused travis.yml
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.travis.yml | 25 -------------------------
1 file changed, 25 deletions(-)
commit 887c1c9a02eea6d7e894406e64faaf1fbb803cab
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 12:49:22 2020 +0200
Test also dist target through both meson and autotools
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
commit 5123a3d2da5ff525f818cc76fb4058170578d602
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Sep 15 12:49:01 2020 +0200
Add correct files to autotools dist target
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit d31caac6af7c8c47af18cc2501e3d98e5c09d2b1
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Sep 3 16:14:27 2020 +0200
NEWS: Prepare for v2.8.0 release
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
NEWS | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 8803567fb3cec7f5142710b4992b8f6b97fc03c7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Sep 3 15:52:41 2020 +0200
Add a link to QEMU documentaiton of CCID device
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
README.md | 5 +++++
1 file changed, 5 insertions(+)
commit 1328c2b800b3cd64d867ba4cc6f62e1c8748900d
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Aug 11 08:47:01 2020 +0000
Add fuzzing status badge from oss-fuzz
README.md | 1 +
1 file changed, 1 insertion(+)
commit d38b8679361a235c0d7b3bf8a925129e1e435965
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jun 25 10:30:43 2020 +0200
vreader: Do not log critical errors on unknown instruction
Fixes !9
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vreader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2333c79b65b4e439fb4b0c6d79e2bdd036c5bfcd
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jun 25 10:25:25 2020 +0200
fuzz: Fix formatting
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_options.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 59198e5d8fda5f6c51e3753817f72a10df89057e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jun 25 10:25:13 2020 +0200
fuzz: Fix error message
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_options.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e50858ad028e9496084ef0884791b3fcaab02f9c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 27 10:55:52 2020 +0200
gitlab-ci: Add CentOS 7 build and test targets
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
commit 355279d8e33a03119341fb4d7ffc6e7c0dce6c1d
Author: Frediano Ziglio <freddy77@gmail.com>
Date: Mon Apr 27 08:33:02 2020 +0100
ci: Avoid apt-get to ask questions
With last Ubuntu update apt-get will ask interactively some
question causing the CI to hang and fail due to timeout.
Avoid this interaction.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
commit 041369419ff3818ffbeb6451aeefd1a69e7db8dc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Apr 21 11:55:29 2020 +0200
vcard_emul_nss: Fix parameter name in usage documentation
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9690b9445d74f2809cd7dcbd10c09b8d2867929a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 19:10:58 2020 +0200
fuzz_options: Clean up allocated memory
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_options.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
commit e392f893c82e0112b5008eab39339bc6e9aaf77a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 17:05:29 2020 +0200
Fuzzer for options parser
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_options.c | 40 ++++++++++++++++++++++++++++++++++++++++
fuzz/meson.build | 1 +
2 files changed, 41 insertions(+)
commit a3b0f33697682782e6e99dfb71d4d11c93da7856
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 19:09:28 2020 +0200
vcard_emul_nss: Avoid redefinition of already set options
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit e58b911d0983d6a6b196df97b517a82df866e9d5
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 18:49:17 2020 +0200
vcard_emul_nss: Clean up memory
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
commit 9d352ecdaf8ccf446c7e1c9706cb7329b5647f9d
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 18:43:01 2020 +0200
vcard_emul_nss: Do not use const char for something changable
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit aebeee08e245d630c0d5e4e85a8678702aa96347
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 18:16:35 2020 +0200
vcard_emul_nss: Avoid null deref when parsing options
Error from fuzzer:
==7==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x0000004e1a32 bp 0x7ffdf742d050 sp 0x7ffdf742cfa0 T0)
==7==The signal is caused by a READ memory access.
==7==Hint: address points to the zero page.
SCARINESS: 10 (null-deref)
#0 0x4e1a32 in vcard_emul_options /work/meson/../../src/libcacard/src/vcard_emul_nss.c:1282:13
#1 0x4cb79e in LLVMFuzzerTestOneInput /work/meson/../../src/libcacard/fuzz/fuzz_options.c:54:15
[...]
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0424cfbe6562c49154e2feef4ad51ca8807c8a42
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 20 16:12:54 2020 +0200
Fuzz also simpletlv parser
The parser is not covered as it is used for parsing output of real
cards (which are not available in tests and emulation).
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_simpletlv.c | 27 +++++++++++++++++++++++++++
fuzz/meson.build | 2 ++
2 files changed, 29 insertions(+)
commit 806335366f5c332efb9d457078199c0e932a72dc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Apr 16 19:52:55 2020 +0200
tests: New tests of initialization
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Makefile.am | 8 ++++++
tests/initialize.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/meson.build | 13 +++++++++
3 files changed, 101 insertions(+)
commit 57deaec6d70711c1cb87896991ab1fe9ff1879b3
Author: Jakub Jelen <jakuje@gmail.com>
Date: Sun Dec 15 21:33:24 2019 +0100
Add first simple fuzzer
Per [1], we are good to go to integrate in oss-fuzz. This adds
aa simple fuzzer and some housekeeping/preparatory work around
build system to be able to build fuzzers for oss-fuzz.
The fuzzers can be built only with new meson build system as
trying to make it working with autotools was quite a pain.
The oss-fuzz is already running on my fork temporarily, before
this will be merged as in [2].
[1] https://github.com/google/oss-fuzz/pull/3019
[2] https://github.com/google/oss-fuzz/pull/3466
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
fuzz/fuzz_xfer.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
fuzz/fuzzer.c | 38 +++++++++++
fuzz/fuzzer.h | 13 ++++
fuzz/meson.build | 22 +++++++
meson.build | 4 +-
5 files changed, 272 insertions(+), 1 deletion(-)
commit 358e2d8bb045d80803190534ec1986c4242d10fc
Author: Frediano Ziglio <freddy77@gmail.com>
Date: Fri Apr 17 10:00:25 2020 +0100
Avoids some code duplication
Call NSS_InitContext and handle its result once.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
commit 936519e55c24314a28faed6caf34fbac120bb89a
Author: Frediano Ziglio <freddy77@gmail.com>
Date: Fri Apr 17 09:46:37 2020 +0100
Cache g_get_system_config_dirs results
Do not call the function 3 times in a row.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 30bdd7c9e31bb3a79ba6ccd876e172f2c72c1352
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Mar 10 10:51:45 2020 +0100
vcard_emul_nss: Avoid memory leaks by properly freeing all references
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 2 ++
1 file changed, 2 insertions(+)
commit 1b03307d55577d5cb8891a223de408d9d7c42ba8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Mar 9 16:13:37 2020 +0100
Generate new NSS DB for tests
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/db/cert8.db | Bin 65536 -> 0 bytes
tests/db/cert9.db | Bin 0 -> 36864 bytes
tests/db/key3.db | Bin 16384 -> 0 bytes
tests/db/key4.db | Bin 0 -> 61440 bytes
tests/db/pkcs11.txt | 5 +++++
tests/db/secmod.db | Bin 16384 -> 0 bytes
6 files changed, 5 insertions(+)
commit 42475d4ca9ae8b75b349b9b522837de50e8a487b
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Mar 6 14:52:07 2020 +0100
Use the new finalize API in tools and tests and refactor the order of the calls in cleanup
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vscclient.c | 2 ++
tests/hwtests.c | 7 ++++++-
tests/libcacard.c | 9 +++++++--
3 files changed, 15 insertions(+), 3 deletions(-)
commit a9fb4177973ad99d3ec030d30a4388c26149a759
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Apr 16 18:56:39 2020 +0200
vcard_emul_nss: Use NSS_{Init,Shutdown}Context() functions to avoid messing with not owned contexts
As recommended by the NSS wiki:
https://wiki.mozilla.org/NSS_Library_Init
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
commit 177d55dfcc373b3c466fba26b3930c7a3ec38cd1
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Mar 6 14:40:03 2020 +0100
Introduce new API for cleanup
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
docs/libcacard.txt | 5 +++++
src/libcacard.map | 1 +
src/vcard_emul.h | 1 +
src/vcard_emul_nss.c | 14 ++++++++++++++
4 files changed, 21 insertions(+)
commit fd2e0949a2fbb94f761218c2268761a9c7386501
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 5 16:13:30 2020 +0100
Do not attempt to run HW tests without all dependencies
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/meson.build | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
commit f920d8c505e76ec1a66bc447e189eefb2ffd5b0e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 5 15:26:44 2020 +0100
meson: Allow building static libraries
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 954d4ca5b7840fe324ce7af1c85342edf70ba828
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 5 14:05:37 2020 +0100
meson: Add an option do skip tests
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
meson.build | 4 +++-
meson_options.txt | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
commit 6c82a8e4bcbfafc929ed3a946dadca239443e519
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 4 16:19:54 2020 +0100
meson: The libcacard test does not require softhsm
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/meson.build | 1 -
1 file changed, 1 deletion(-)
commit e63bc9f3d63a74a07cd6b56e86a410ba0ab33249
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 4 11:03:20 2020 +0100
vcard_emul_nss: Log message if the NSS_Init fails (with db dir used)
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vcard_emul_nss.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
commit 243d116407f9a3ce134dfb02fa6bc5c4064fc970
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Mar 3 17:36:28 2020 +0100
Fix link to contribution documentation
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af251faaea392d6786dee32bfa82bf03a44b7500
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Mar 3 13:22:54 2020 +0100
gitlab-ci: Run also tests from meson
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
commit aa49fabb846bd00d5099338714e04fac1b002400
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Fri Jan 31 11:01:38 2020 +0000
ci: Rename "meson" job to "Fedora meson"
All other job names start with the distribution name.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a56873faf3703429823c3310c80064aa62fab456
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Wed Jan 29 20:59:15 2020 +0000
build: Clean unwanted files packaging the distribution
Remove CI files and other not necessary files.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
build-aux/meson-dist | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit 9fd0f50a86649b017fb23bf7c57dfc4e0e35972d
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Wed Jan 29 20:37:37 2020 +0000
build: Generate ChangeLog like autoconf
Instead of generating THANKS, generate ChangeLog like autoconf does.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
build-aux/meson-dist | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
commit f0bf1b44610f0733d2e2fde5ffce414ec71fa303
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 15 16:16:38 2020 +0400
build-sys: add meson
autotools is left for now, for a small transition period, and to cover
win32 when either p11 backend is added or nss is packaged again in mingw.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 8 ++++-
Makefile.am | 12 +++----
build-aux/meson-dist | 23 +++++++++++++
meson.build | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++
meson_options.txt | 4 +++
src/common.c | 2 --
src/libcacard.map | 82 +++++++++++++++++++++++++++++++++++++++++++++
src/libcacard.syms | 77 ------------------------------------------
src/simpletlv.c | 2 --
tests/meson.build | 52 +++++++++++++++++++++++++++++
10 files changed, 268 insertions(+), 88 deletions(-)
commit 9f19c8f1520ba0e12fa949a3136a69e208d3c08a
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 29 10:39:11 2020 +0100
Fix -Wunused-parameter warnings
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/hwtests.c | 2 +-
tests/libcacard.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 0fc45266550f5b6bd0da8a8e40245d7ff09618ee
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jan 23 17:30:20 2020 +0100
setup-softhsm2: Try to find library on Ubuntu
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/setup-softhsm2.sh | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit 48c4dea84674a2da2271a0bbb29cda7696b151d6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jan 23 16:20:08 2020 +0100
Add Ubuntu target to catch different issues
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
.gitlab-ci.yml | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
commit 383dfad4ea750ca0d6317a04bf168ddf7b593dd7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jan 23 16:30:11 2020 +0100
Properly add glib dependency to unbreak vsclient and tests build on Ubuntu
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Makefile.am | 10 +++++++---
configure.ac | 3 ++-
2 files changed, 9 insertions(+), 4 deletions(-)
commit 83c87e0a2e064442d88949ff2a3842cc626748b5
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu Jan 23 13:53:25 2020 +0400
build-sys: remove unused LIBCACARD_COMPILATION
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Makefile.am | 1 -
1 file changed, 1 deletion(-)
commit 8c65e93093a7218a7cda8a5a5a1c385cf298f579
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 22 15:40:23 2020 +0400
libcacard.pc.in: improve description
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
libcacard.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b0ab359d3ec577960fa9874893e1be52e4eff29b
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 22 15:40:11 2020 +0400
build-sys: improve --disable-pcsc help
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2e8eef9d3f8e2faf12d20a9adf0f85d53e511de5
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 22 15:20:48 2020 +0400
tests: fix shebang
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
tests/setup-softhsm2.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6e456bf6ad9731623786b4fb834b062481b1fd97
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Jan 15 14:37:17 2020 +0400
build-sys: bump glib dependency to 2.32
Since version 2.32, gthread is an empty shell, and g_thread_init() is
no longer required.
GLib 2.32 was released on 2012-03-24, and is available in all distros
we care about.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Makefile.am | 5 +-
configure.ac | 3 +-
src/cac-aca.c | 3 +-
src/cac-aca.h | 1 -
src/cac.c | 2 +-
src/capcsc.c | 5 +-
src/card_7816.c | 2 +-
src/event.c | 6 +--
src/glib-compat.h | 138 --------------------------------------------------
src/gp.c | 2 +-
src/msft.c | 2 +-
src/vcard.c | 2 +-
src/vcard_emul_nss.c | 4 +-
src/vcard_emul_type.c | 3 +-
src/vreader.c | 6 +--
src/vscclient.c | 15 ++----
16 files changed, 28 insertions(+), 171 deletions(-)
commit d276f5a05a58620b8952063fa0147165a1e8d8e8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Dec 2 17:44:32 2019 +0100
Add CII Best Practices Badge
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 2f20d62e7ad6890d7d34a8443e7051d29e91a3f6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Dec 2 17:31:33 2019 +0100
README: Add high-level description of the libcacard project
and links to other documents inside
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
README.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 73 insertions(+), 1 deletion(-)
commit 4efc0459287a8df407893682d72d3a0e770cefdb
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Dec 2 17:31:02 2019 +0100
Clarify contributor guidelines
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
CONTRIBUTING.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
commit 2126c18d649ab37ddc73bb556d7c671446da0ece
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Dec 2 17:30:23 2019 +0100
Fix typo in README
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6566b169953add012fe773b882cca4b6076131a9
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Dec 2 14:59:59 2019 +0100
fix typo in comment
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2bae8772377597718852b37f6b84db005c01ec67
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Thu Aug 23 12:54:20 2018 +0100
simpletlv: Reuse g_memdup
The effect of g_new+memcpy is the same of a single g_memdup
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/simpletlv.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit 6eb75750d0167810d88f2551ac0c56bad6a3bbdb
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Fri Nov 15 16:47:39 2019 +0000
ci: Ignore OpenSSL memory leak
OPENSSL_init_crypto allocates some memory that will only freed
by the operating system when the process will terminate and
are reported as leak.
Ignore these leaks to make Gitlab "asan" job so succeed.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 2 +-
suppr.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit e3ef3dd597b54e1f4f42f0670f2f6bf6af745fd3
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Fri Nov 15 15:53:15 2019 +0000
ci: Try to get readable errors
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 21a3f9ecb2fa5d859afc066a8837a029f6064606
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Fri Nov 15 16:33:59 2019 +0000
vcard_emul_nss: Remove leak in vcard_emul_rsa_op
The private key returned by PK11_FindPrivateKeyFromCert should
be freed by SECKEY_DestroyPrivateKey.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit af691f98f6209db91348c1e3a553ed58da3ee091
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Nov 15 12:00:27 2019 +0100
simpletlv: Handle zero-length values in recursive tags
Fixes #4
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/simpletlv.c | 2 ++
1 file changed, 2 insertions(+)
commit 43c05401c48d98572c53c92b81237f607f85386d
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Nov 15 13:50:26 2019 +0100
vscclient: Avoid memory leaks
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/vscclient.c | 4 ++++
1 file changed, 4 insertions(+)
commit ebffe4d6a60c74dbf2c0c3227401ca1a62bd4a67
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Sep 11 09:45:34 2019 +0200
cac-aca: Avoid type casting causing test failures on s390
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
src/cac-aca.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 06587ef683373690f61540935b4516b4f23238ea
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Aug 27 12:38:45 2019 +0200
tests: Reproducer for pkcs11 modules invalidating object handles on logout
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/hwtests.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit 2c10ae315375730020108cbcae0c282d0d6eff5f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Aug 26 17:42:06 2019 +0200
vcard_emul_nss: Drop the key caching to simplify error handling
It could happen with PKCS#11 modules that (correctly) invalidate object
handles after logout (which was introduced in 0d3a683a), that the handles
are not valid when we try to use the objects again.
This is trying to address this use case, which I noticed was breaking
CI with SoftHSM PKCS#11 modules.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
commit e4d4c13f25fd2a13ba07c71069be5e5fa65fd603
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jul 8 13:22:45 2019 +0200
NEWS: prepare for v2.7.0 release
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
NEWS | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 28540219dbca00a9514d29d6d989956706871325
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jul 8 13:22:06 2019 +0200
NEWS: typos
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 708fed0c074adafe78aca013c206ff66978d7c35
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Jul 4 14:59:24 2019 +0200
cac: Use g_memdup for better readability and avoiding code duplication
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 13bc693196e86b281d3c503b21f62d8dd338464a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jun 11 13:16:34 2019 +0200
cac: Drop handling of unknown bogus instruction
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 9 ---------
1 file changed, 9 deletions(-)
commit f3362468054189149563185e5cfd23173c6b6caf
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jun 10 18:00:27 2019 +0200
tests: Run the GP tests also against HW card
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/common.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/common.h | 1 +
tests/hwtests.c | 1 +
tests/libcacard.c | 48 ------------------------------------------------
4 files changed, 57 insertions(+), 48 deletions(-)
commit a8c2aff8682201f7febd159b0c873acab49e1225
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jun 10 17:58:50 2019 +0200
gp: Demystify Card recognition and card production life cycle data including card-unique serial number
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/gp.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 15 deletions(-)
commit bae3a1364e3c537f1b9372558086cf85cf062af0
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jun 10 17:58:30 2019 +0200
vcard: Add a way to provide card serial number
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
docs/libcacard.txt | 13 ++++++++++++-
src/vcard.c | 19 +++++++++++++++++++
src/vcard.h | 5 +++++
src/vcard_emul_nss.c | 32 ++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+), 1 deletion(-)
commit ab1b727c98f2f30e26d41c2a0907fb69dd0f17c7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jun 10 16:17:17 2019 +0200
tests: Verify that after the MSFT applet operations, the PIN query returns expected value
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/common.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/common.h | 2 ++
tests/hwtests.c | 1 +
tests/libcacard.c | 48 --------------------------------
4 files changed, 85 insertions(+), 48 deletions(-)
commit fac5b61fbcc17647a89d216fa927d6ee7cd5dcc7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Jun 10 15:08:24 2019 +0200
When we talk with Windows drivers, pretend to know how much pin prompts remains
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
docs/libcacard.txt | 11 +++++++++++
src/card_7816.c | 2 +-
src/msft.c | 2 ++
src/vcard.c | 21 +++++++++++++++++++++
src/vcard.h | 4 ++++
src/vcardt.h | 2 ++
6 files changed, 41 insertions(+), 1 deletion(-)
commit 1c00b79c9e6e616b27169fc296ce542b69fb3634
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Apr 16 11:53:03 2019 +0200
cac: Clone also ATR to match one from the official list
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 25 +++++++++++++++++++++++++
tests/libcacard.c | 22 +++++++++++++++++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
commit 7e2cbd9e89508e9567378f358e0c6b1c82ea2103
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 15 16:37:58 2019 +0200
Drop bogus checks not to confuse static analysis checkers
The cac_delete_*_applet_private() functions already handle the NULL arguments
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
commit 7fb171cdb84ae80e170587be97555a63986cd9f3
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 15 13:28:47 2019 +0200
msft: Implement MS PnP applet to simplify card detection under Windows
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Makefile.am | 2 ++
docs/libcacard.txt | 1 +
src/msft.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/msft.h | 28 ++++++++++++++++
src/vcard_emul_type.c | 3 ++
tests/libcacard.c | 49 +++++++++++++++++++++++++++
6 files changed, 176 insertions(+)
commit a595abf10679f9388561ee483835e98bd5781954
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 15 13:26:44 2019 +0200
card_7816: Handle AIDs of arbitrary length
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/card_7816.c | 16 ++++++++++++----
tests/common.c | 12 +++++++-----
2 files changed, 19 insertions(+), 9 deletions(-)
commit 42bc407b960633c752274692e93acc597d8e7db6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Apr 15 13:25:25 2019 +0200
gp: Fix typos and formatting issues
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/gp.c | 6 +++---
tests/libcacard.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
commit 597ea5d98b6d64b063463ccc2a28132825d3d202
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Apr 4 11:19:54 2019 +0200
Missing dependency for the test script
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 04d897f91fbaa402e230661b453b7b502880bdc5
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 17:19:38 2019 +0100
Avoid unused arguments warnings
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 5 ++---
src/cac.h | 2 +-
src/capcsc.c | 6 +++---
src/card_7816.c | 3 ++-
src/gp.c | 2 +-
src/vcard_emul_type.c | 4 ++--
src/vscclient.c | 22 ++++++++++------------
7 files changed, 21 insertions(+), 23 deletions(-)
commit 03bdafa0fc209584eb1ff2dc21aea1f0c7491bfd
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 17:18:13 2019 +0100
cac-aca: Get rid of unused arguments in internal functions
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac-aca.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
commit 4bfb3427f2e041a3cb1b89e8685d880da1bf9291
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 17:17:47 2019 +0100
cac-aca: Get rid of missing-field-initializers warnings
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac-aca.c | 240 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 120 insertions(+), 120 deletions(-)
commit f87a9a00732282f5c39ebe4d9a15a40c46d0ae12
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 16:33:38 2019 +0100
gitlab-ci: Use csbuild static analyzer
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 5f188225559a0745a7e7600304afc171f9ab8c53
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 16:32:01 2019 +0100
Avoid unused arguments
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 10 +++++-----
src/vcard_emul_type.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
commit 27b75a2f15b1a9be41d0d6c51552f23c1f929e26
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 16:22:53 2019 +0100
.gitlab-ci: Try to build it with clang
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit aa00a2f26445a2b1fb45d53ce47314a31e8bf687
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 16:21:28 2019 +0100
simpletlv: Avoid errors reported by clang
src/simpletlv.c:345:12: error: cast from 'gchar *' (aka 'char *') to 'struct simpletlv_member *' increases required alignment from 1 to 8 [-Werror,-Wcast-align]
return (struct simpletlv_member *)g_array_free(tlv, FALSE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/simpletlv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 44c2f9bab05e470a0ac1dd387bfcca3b1f0b0b6e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 15:19:20 2019 +0100
simpletlv: Avoid infinite loop and invalid free()
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/simpletlv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit f9834bff1ea970e876a38a23e31cfa28ff881984
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 15:17:15 2019 +0100
simpletlv: Do not allocate if there is no way to return the allocated data
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/simpletlv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9c14062f615040a444eb153edc481b80fff2cdae
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 15:07:02 2019 +0100
simpletlv: Initialize pointers to avoid potential assignment of garbage
clang error:
libcacard-2.5.2/src/simpletlv.c:130:19: warning: Assigned value is garbage or undefined
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/simpletlv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 0f9cab8c3d96059bfeedebc4a92f62f50b236372
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 15:01:23 2019 +0100
cac: Avoid pointers from static structure to the function-local variables after return
clang error:
libcacard-2.5.2/src/cac.c:2021:1: warning: Address of stack memory associated with local variable 'number_objects' is still referred to by the global variable 'properties' upon returning to the caller. This will be a dangling reference
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 5 +++++
1 file changed, 5 insertions(+)
commit 1d4fdfb73440932c3349bdde1d62f03a5b864ca6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:42:31 2019 +0100
cac: Avoid calling memcpy with NULL argument
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit 1f9728ee3bdae99517d3a4072290e3451c329382
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:42:16 2019 +0100
cac: No need to check for errors from g_new0()
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 10 ----------
1 file changed, 10 deletions(-)
commit 5c0afa832c2e03388b0f3df14a74a5d1f825d69b
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:41:45 2019 +0100
cac: Systematically check for return values and initialize pointers
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
commit deeb234f5335686d2c9fef6ba23aeea078730cbb
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:24:39 2019 +0100
cac: Consistently use of ret value to avoid coverity warnings
libcacard-2.5.2/src/cac.c:289:17: warning: Value stored to 'ret' is never read
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 94d15d044ba67853227c78f215edb81dad6ea6d3
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:13:40 2019 +0100
cac-aca: Avoid dead code reported by coverity
Strictly speaking, the config field can be empty and therefore the next check for outlen is bogus.
This is not the case in the current tables we have, but checking only for the length that we are
just going to write is more correct.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac-aca.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 222d167424d643b5531ec64bc3eb24c18b8516ad
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Mar 28 14:13:14 2019 +0100
card_7816: Log the selected applet AID
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/card_7816.c | 2 ++
1 file changed, 2 insertions(+)
commit 5affe0883f8282d25d19f67e6b9729cc2364eeda
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Mar 26 16:54:01 2019 +0100
build: Import new ax_code_coverage.m4 macro
ax_code_coverage.m4 was changed incompatibly in recent autoconf-archive
versions, and having a new autoconf-archive version installed is enough
to get a configure failure. Let's use an internal copy of
ax_code_coverage.m4 until the new version is available in most distros.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Makefile.am | 8 +-
m4/ax_code_coverage.m4 | 272 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 277 insertions(+), 3 deletions(-)
commit 4b0613135775c94a8843d9ce16bed712eddc0632
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 27 10:54:57 2019 +0100
cac: Initialize pointer
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e30db02f8d27020a72a94db7d9fbe73277b09175
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 27 10:24:17 2019 +0100
cac: Whitespace cleanup
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit abc0443e54ebdac67ecc098f1124d142b65c34e8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Mon Mar 25 14:08:45 2019 +0100
gitlab-ci: Upload artifacts from asan failures
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
commit f5783136b21fbe6a9a3ce352af636ecd0e06b856
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 17:31:21 2019 +0100
tests: Make sure the card is reset before querying for the pin attempts
The "cloned" smart card will be locked since it has PIN defined, while
the emulated smart card (NSS DB or internal softtoken) does not have
passphrase and therefore is always unlocked.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/common.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
commit 2db3eea29748e09fb33cca51f4a8c9151a20590a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 17:11:28 2019 +0100
tests: Verify that VERIFY succeeds after login
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/hwtests.c | 12 ++++++++++++
tests/libcacard.c | 12 ++++++++++++
2 files changed, 24 insertions(+)
commit 88666c942a2f86a5353bf73bae20ba9c8037a508
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 16:18:34 2019 +0100
card_7816: Follow the ISO 7816-4 (Section 6.12.3) semantics of the VERIFY command
All the corner cases are not covered in the GSC IS 2.1, but the ISO
specifies the following:
> When the body is empty, the command may be used either to retrieve
> the number ‘X’ of further allowed retries (SW1-SW2=’63CX’) or to
> check whether the verification is not required (SW1-SW2=’9000′).
This code modifies the card implementaion to match this behavior,
namely the handling of the check for the login status.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
docs/libcacard.txt | 5 +++++
src/card_7816.c | 7 ++++++-
src/vcard_emul.h | 1 +
src/vcard_emul_nss.c | 26 ++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 1 deletion(-)
commit 84ac942561d482d32bea133d252e8d15cb301042
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 16:16:46 2019 +0100
tests: The NSS DB automatically loads all the PKCS#11 modules in Fedora 29+
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/setup-softhsm2.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 29aa216f0c0c0cc33bee3b52bac775ba06acb222
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 16:15:24 2019 +0100
README: Update compatibility description
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 299e59548e1a48f320b7f04603fb0c1714c71464
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 16:14:35 2019 +0100
vcard_emul_nss: Avoid deprecation warnings from NSS
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cab56021545c8f92888facb97cea68fb21bc57da
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Mar 20 17:29:25 2019 +0100
Add debug logs for better tracing
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
src/cac.c | 4 ++++
src/capcsc.c | 2 ++
src/vcard.c | 4 ++++
src/vcard_emul_nss.c | 14 ++++++++++++++
src/vcard_emul_type.c | 2 ++
src/vreader.c | 2 ++
6 files changed, 28 insertions(+)
commit d12b85a2de98e503f7e2e9bbfdb2f28139a2fa04
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Wed Aug 29 20:41:03 2018 +0200
Prepare for 2.6.1 release
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
NEWS | 6 ++++++
1 file changed, 6 insertions(+)
commit f4a3579fff60168fc8650aa80623bac4752adc6d
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Tue Aug 14 10:29:48 2018 +0100
Use proper free function for PK11_ReadRawAttribute call
As documented in PK11_ReadRawAttribute data should be freed with
PORT_Free, not free or g_free.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
src/vcard_emul_nss.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit 03d3dd61c6c73c9d069163a8081f55e399c8430c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Wed Aug 22 17:59:36 2018 +0200
tests: Avoid buffer overflow when creating invalid PKCS#1.5 paddded data
* The sign array is the whole APDU.
* For payload of less than 256 bytes (for RSA keys of less than 2k),
we fit Lc part in one byte (instead of 3 as in template for larger keys),
which means the "header" is only 5 bytes long. The Le value is adjusted
on line 298.
* On the sixth byte (line 299), there already start PKCS#1.5-padded
data [1]. This byte needs to be zero from [1]
* The line 300 marks where the intentional error is -- we are trying
to create bad PKCS#1.5 padding -- we overwrite it with 0xff padding later.
* The memmove() line is moving the tail of padded data (where the actual data
is stored) by shrinking the padding in the middle.
* The padding (for simplicity, 0xff bytes are used) starts on the 7th
byte and spans before the next 0x00 byte.
* The memmove(), in theory, should copy data up to the end of the
original, 256 bytes payload, but it can move also the last byte which
specifies the Le (handled separately)v. This means, we were 3 bytes off.
* target (&sign[6]) -- this is the place where the padding starts in
the new buffer
* length (key_bits/8 - 1) -- the length of payload is 128 bytes, but
we already wrote the first byte (line 299).
* the source was wrong (&sign[sign_len-key_bits/8]) -- we need to find
a place where to start copying data from to match the ends of payloads
in the buffer (128 B and 256 B).
* The lines 302 and 303 adjust the buffer lengths and appends 0x01
(Le) of APDU.
[1] https://tools.ietf.org/html/rfc2313#section-8.1
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
tests/hwtests.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit 0196abb1dbdefcb37f648a10d5c88ff461ed8f8a
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 16:57:52 2018 +0200
aca: Mark local constants/data as const/static
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac-aca.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
commit 13e84fc243b4c8207fa0e2866806c48acceadacd
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 16:55:24 2018 +0200
aca: Fix off-by-one error when iterating over applets_table
It has elements from 0 to num_applets-1, and we were using elements from
0 to num_applets when iterating in cac_aca_get_applet_acr_coid()
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac-aca.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a1cd8838819903c82412d62a6331d94094c2c0e1
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 16:43:56 2018 +0200
vcard-emul-nss: Fix VCardKey leak
vcard_emul_make_key() allocates memory for the VCardKey structure, but
vcard_emul_delete_key never frees that memory. Since VCardKey definition
is private to vcard-emul-nss.c, there are no users which could use a
stack-allocated VCardKey.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/vcard_emul_nss.c | 1 +
1 file changed, 1 insertion(+)
commit 0a5ecf3fa5c88cfae04ea421d9e6ff76c3156b35
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 16:37:42 2018 +0200
Fix 'platfrom' typo
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/card_7816.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a103b9bd87e811c525cd8158d4097a83fac6b2b4
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 16:35:12 2018 +0200
gp: Remove unused arguments
gp_card_init() has a prototype similar to cac_card_init() but does not
use most of its parameters. This commit removes these.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/gp.c | 7 +------
src/gp.h | 5 +----
src/vcard_emul_type.c | 5 ++---
3 files changed, 4 insertions(+), 13 deletions(-)
commit 3031bdbdc3da587443b71a90339282eaa1f8ae5d
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 11:06:30 2018 +0200
hex_dump: Fix buffer overflow
When printing the hexdump output, the hex_dump() function prints 5
visible chars at a time, but since it's using sprintf, it will also
print a '\0'. Since its output string are sized to be 5*number_of_chars,
this means we will overflow the output string by one character on the
last iteration. This commit ensures the output strings are properly
sized to avoid this.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/common.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 62441d830379b5b7abd2f395ba1f4b6a1d45d66d
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 14:06:02 2018 +0200
hex_dump: Add unit test
This test is currently failing under ASAN, the next commit will fix
this.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
tests/libcacard.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
commit 77375de4ff80833cfa42b24c61f9663b5667c896
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 15:46:36 2018 +0200
ci: Add check using AddressSanitizer
hex_dump in git master currently has a 1 byte buffer overflow which
valgrind is not able to catch, but asan detects it.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
.gitlab-ci.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 87eac723d3575e2e6d1fc28c1ee358267407a17e
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 11:32:26 2018 +0200
hex_dump: Mark source data as const
hex_dump() is not going to modify it.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/common.c | 2 +-
src/common.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 37f8a34d3eacb3793476b202442d8a94ec47aa06
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 21 11:15:12 2018 +0200
hex_dump: Remove unused arguments
hex_dump() callers can theoretically provide the destination buffer
for the hexdump'ed string, but nothing in libcacard uses that feature.
This commit removes it.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac-aca.c | 10 +++++-----
src/cac.c | 8 ++++----
src/common.c | 19 +++++--------------
src/common.h | 3 +--
4 files changed, 15 insertions(+), 25 deletions(-)
commit b6e3ecadd87890d6840904eb83427a9097151637
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Tue Aug 14 10:33:29 2018 +0100
Do not use static buffer to avoid possible races
Using a static writeable buffer and threads could lead to race
conditions (like multiple threads calling the same function).
The fci_template buffer is changed some lines below with a memcpy.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
src/card_7816.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6457380784009e59853e36b28e776fedb9a3eba1
Author: Frediano Ziglio <fziglio@redhat.com>
Date: Tue Aug 14 10:34:23 2018 +0100
Fix typo in comment
Porprietary -> Proprietary
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
src/card_7816.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 46d0455dc1a495a71d3216beae4e65e097c558d1
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Aug 10 22:36:20 2018 +0200
simpletlv: Use GArray to make simpletlv_parse simpler
This allows to get rid of manual reallocations.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/simpletlv.c | 37 +++++++++++--------------------------
1 file changed, 11 insertions(+), 26 deletions(-)
commit cd978ec02ad630e5054fac5b9c80ca612aec18d9
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Aug 10 10:01:35 2018 +0200
simpletlv: Use g_malloc instead of malloc
This is more consistent with the rest of the codebase.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/simpletlv.c | 35 ++++++++++++-----------------------
1 file changed, 12 insertions(+), 23 deletions(-)
commit 7df1fd7792361c1ce1e9b60f8b51d1d909f69955
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 14 14:36:06 2018 +0200
simpletlv: Slight improvement to API documentation
Document return value of simpletlv_get_length and simpletlv_encode and
fix a few typos.
src/simpletlv.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 6bdeb60df12811da3e8b18f70909f2c475d0c937
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 14:48:38 2018 +0200
cac: Mark the global aid data as const
This data is not meant to be modified, marking it as const allows it to
be put in the .relro section, and could help catch unwanted
modifications attempts.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac.c | 32 ++++++++++++++++----------------
src/card_7816.c | 10 +++++-----
src/card_7816.h | 4 ++--
src/vcard.c | 4 ++--
src/vcard.h | 4 ++--
5 files changed, 27 insertions(+), 27 deletions(-)
commit f6bcd130a4489cfb239361717d15c36bd23fd5e1
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 15:33:11 2018 +0200
cac-aca: Favour g_return_val_if_fail over g_assert
Some g_assert are used to sanity-check input arguments of some methods.
g_return_val_if_fail() is more appropriate for that as it won't cause
the program using libcacard to terminate. The callers of these methods
are already checking the return value for NULL.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac-aca.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit d9250fa0e714d5be2d88fb6c750ca1fe059b3739
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 15:53:40 2018 +0200
Favour g_assert over assert
Most of the code base is using g_assert, use it everywhere for
consistency.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac.c | 14 +++++++-------
src/card_7816.c | 4 ++--
src/vcard.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
commit 4d20da295356ab36bcaee683c373a5c48f30b46d
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 15:55:35 2018 +0200
simpletlv: Remove unused #include <assert.h>
The SimpleTLV code does not call assert()
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/simpletlv.c | 1 -
1 file changed, 1 deletion(-)
commit c5984e5d99e74a0f76029bae4f762cd464085e04
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 15:38:01 2018 +0200
Fix 'arguemnts' typo
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/simpletlv.c | 2 +-
src/simpletlv.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 32394c3e9d42d011e281df4a5d12fe73791e058f
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Aug 9 14:48:16 2018 +0200
Fix 'Reqested' typo
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
src/cac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f4c25feda0ac2ce141c7d3ee4e44a3e2f9760637
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue Aug 14 15:01:36 2018 +0200
tests: Fix 'simpletlv' on i686 arches
The simpletlv_* functions return lengths as an int, but the test is
casting it to a size_t before comparing it against -1. This is not
giving the expected result on i686, causing the test to fail. The
variables used in the test do not need to be size_t, and can be changed
to int to match the return value and avoid the failure.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
tests/simpletlv.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 0ba3be85e99a629d5457f26516614c7a56e2586e
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Mon Aug 13 18:11:03 2018 +0200
tests: Add cert.cfg to EXTRA_DIST
Without it, make check from tarballs will fail.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 652b01dba57afda06d1a0844d0f8c441bb3d8380
Author: Jason Andryuk <jandryuk@gmail.com>
Date: Tue Jul 24 14:34:59 2018 -0400
vreader: Handle read failure
If a command fails, card_status will not match VCARD_DONE. That will
trigger the assert and abort the process. Instead, handle VCARD_FAIL and
return an error in that case. Client software can then deal with the
error, and we continue running to handle future commands.
This can be triggered by removing the physical smartcard mid-operation.
The setup is qemu <-> vscclient <-> pcscd with passthru:
vscclient -e 'use_hw=yes hw_type=passthru'
In a Windows VM, I ran `certutil -scinfo` from a cmd window. While it
was running, I pulled out my smart card. Without this patch, vscclient
terminates. With it, vscclient continues running.
The call stack is:
vreader_xfr_bytes
vcard_process_apdu
vcard_process_applet_apdu
apdu_cb
apdu_cb can return VCARD_FAIL for send_receive or
vcard_response_new_data failure.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/vreader.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit 6f9f2a89886cbadb487f7b01c5baef0b95233a3d
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Aug 8 13:19:38 2018 +0200
NEWS: prepare for v2.6.0 release
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
NEWS | 13 +++++++++++++
1 file changed, 13 insertions(+)
commit 1763ee82258a0b22ff3b40f720a7890b47fb4135
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Aug 8 13:15:45 2018 +0200
tests: fix size_t printf format error
With mingw build, the compiler complains:
../tests/libcacard.c:174:17: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t {aka long long unsigned int}' [-Werror=format=]
(in theory, -D__USE_MINGW_ANSI_STDIO=1 should help to use %zu, but
that doesn't work for some reason)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
tests/common.c | 6 +++---
tests/libcacard.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
commit 445788568aa14bed62cc9e42549e444e7c2f2dc6
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue Aug 7 18:10:06 2018 +0200
build-sys: do not install vscclient
vscclient allows to test the "virtual smartcard" protocol without
going through Spice. I never heard of users except developers (it is
partially documented in qemu docs/ccid.txt). I propose to not install
it with libcacard, as we don't want to have to support it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit f2711af5695031fb63d608b8833d9b27f7354072
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Mon Aug 6 13:06:54 2018 +0000
Update README.md with gitlab badges
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit c1a1f2b86a8d5ef912f046681d739e42136595ec
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:44:03 2018 +0200
tests: More ideas to test
* The ATR code paths are not covered
* The card resets code paths are not covered
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-32-jjelen@redhat.com>
tests/libcacard.c | 1 +
1 file changed, 1 insertion(+)
commit 47980a2649bb6b0f5c36dfff931faa2b2649961e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:44:02 2018 +0200
tests: Consolidate the tests for hw and non-hw versions
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-31-jjelen@redhat.com>
tests/common.c | 20 ++++++++++++++++++++
tests/hwtests.c | 44 +++++---------------------------------------
2 files changed, 25 insertions(+), 39 deletions(-)
commit 67dca36d7c1e385418c3bb8b0b13854fc653e893
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:44:01 2018 +0200
tests: Negative test cases to increase coverage
* mostly negative test cases that were missed during initial implementation
* passthrough and empty applets
* multi-part signatures
* check login count
* invalid GET PROPERTIES APDU queries
* invalid SELECT APDU queries
* invalid instructions
* invalid READ BUFFER APDU queries
* invalid GET ACR APDU queries
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-30-jjelen@redhat.com>
tests/common.c | 105 ++++++++++++-
tests/common.h | 5 +-
tests/hwtests.c | 20 ++-
tests/libcacard.c | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 565 insertions(+), 7 deletions(-)
commit d73b64d841fef68c7d8c7ac222c86b47a1d912fc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:44:00 2018 +0200
cac, cac-aca: Implement other undocumented encoding for extended properties
* These modifiers nor format is not documented anywhere, but ActivClient
expects them and cards happily answer them
* This is a kind of more compressed form of other ACA buffers, but it is
extended with some additional values of unknown meaning.
* This is somehow consistent with the standard GET ACR parameters, but if
P1 | 0x40 is set, the response should come in this new format.
* This affects also GET PROPERTIES APDU, where we get also other bunch of
TLVs in case of this bit is set.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-29-jjelen@redhat.com>
src/cac-aca.c | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/cac-aca.h | 9 +-
src/cac.c | 268 +++++++++++++++++++++++++++++++++++++++++--------
src/cac.h | 6 +-
tests/common.c | 45 ++++++++-
tests/libcacard.c | 56 +++++++++++
6 files changed, 621 insertions(+), 56 deletions(-)
commit 08c347c18aeb087a82f925ab1f87d61d00d668e7
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:59 2018 +0200
tests: GP Card Manager and responses on SELECT APDU
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-28-jjelen@redhat.com>
tests/common.c | 20 +++++++++++++++++---
tests/common.h | 2 ++
tests/libcacard.c | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 3 deletions(-)
commit bd64bbb3d950331cf1913bb943102cb6deeaefb8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:58 2018 +0200
tests: Make sure we do not crash on bad data to sign
* This includes also the key bits discovery in test suite.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-27-jjelen@redhat.com>
tests/common.c | 6 +++++
tests/common.h | 2 ++
tests/hwtests.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 88 insertions(+)
commit 8a48f73cca9afdfabc57a820279af19cb98d08bd
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:57 2018 +0200
cac-aca: Extend ACR table with fields for extended ACR
* This is not documented in specification so this is an attempt to
mimic real cards.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-26-jjelen@redhat.com>
src/cac-aca.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
commit 8694db5efdc413318bb992ceb3257ca3f85c89c0
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:56 2018 +0200
tests: Select OID
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-25-jjelen@redhat.com>
tests/common.c | 43 +++++++++++++++++++++++++++++++++++++++++--
tests/common.h | 3 +++
tests/libcacard.c | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 2 deletions(-)
commit c8d2a89621f3b2e39de2ed4acbb0e670151b2e6c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:55 2018 +0200
tests: Extend the hwtests with get_response
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-24-jjelen@redhat.com>
tests/common.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/common.h | 2 ++
tests/hwtests.c | 23 ++++++++++++++++++
tests/libcacard.c | 46 -----------------------------------
4 files changed, 98 insertions(+), 46 deletions(-)
commit 5cdc91f97e8a67e0e5f9478fa9be3412f82fd873
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:44:04 2018 +0200
tests: Create separate hardware tests
* These tests are supposed to run against existing CAC card
connected to local computer, which should be presenting
certificates with 1024 b keys.
* These tests are skipped in case there is no card available.
* This also extends the existing testsuite with tests for
various empty applets
* The setup-softhsm2 script goes through the whole setting of
environment, soft token, generating testing keys, certificates.
* The NSS DB needs to be created under tests/hwdb/ and local
pkcs#11 module needs to be added to the database
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - various fixes for make check & distcheck ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 29 +++
docs/libcacard.txt | 1 +
tests/cert.cfg | 6 +
tests/common.c | 525 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/common.h | 42 ++++
tests/hwtests.c | 287 ++++++++++++++++++++++++++
tests/libcacard.c | 422 ++------------------------------------
tests/setup-softhsm2.sh | 93 +++++++++
8 files changed, 997 insertions(+), 408 deletions(-)
commit f6fc2e2debe81d3564af0a16aed085b7300eff27
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri Aug 3 12:34:31 2018 +0200
options: add use_hw=removable
use_hw=yes is used to specify that libcacard will lookup pkcs11 slots
that are both removable & hardware.
Let's specify that use_hw=removable will select removable slots
(without hardware requirement).
(use_hw= should eventually be changed/aliased to pk11_slots= or
something else)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Jakub Jelen <jjelen@redhat.com>
src/vcard_emul_nss.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
commit bfc2ba9f11d6a2c2bb3fd3d493b4c3c334d7483a
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri Aug 3 12:19:08 2018 +0200
nss: remove unused module_has_removable_hw_slots() check
The check result is unused, the following loop over module list
doesn't need it anyway.
The check became obsolete after commit 8f159d0833a37cbe09376dd2f398c6.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
src/vcard_emul_nss.c | 32 --------------------------------
1 file changed, 32 deletions(-)
commit edb94d4efb973388c23e032ce851ecb213635eac
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Aug 1 01:30:48 2018 +0200
vreader: remove unused define
Looks like it was never used since introduction in commit
983bbd0bda8bb9c0392b668b3edeac1530c3c559.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
src/vreader.c | 2 --
1 file changed, 2 deletions(-)
commit 982556d04718331d5d51e5d438662817fb47ce2d
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:53 2018 +0200
cac: Implement CAC passthrough applets
* The PKI Credential, PKI Certificate and Person Instance applets
are hard to emulate with bogus data and therefore we will
make them available from the existing cards.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-22-jjelen@redhat.com>
src/cac.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 259 insertions(+)
commit 854c1f81fcd90806b8829762a7fc567583bad164
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:52 2018 +0200
vcard_emul: New function vcard_emul_read_object()
* This function is used to read generic data objects presented by
the underlying card, if available. It can provide some structures
that we are not able to emulate in software card.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - do not export the function, minor cleanups ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180802094407.4104-21-jjelen@redhat.com>
docs/libcacard.txt | 8 ++++++++
src/vcard_emul.h | 4 ++++
src/vcard_emul_nss.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+)
commit e3fed69af5e043dc2bf8896f221427f32bdf3460
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:51 2018 +0200
simpletlv: Parse string to internal representation with tests
* The function parses SimpleTLV string to internal structures,
that can be handled with more ease in the code.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-20-jjelen@redhat.com>
src/simpletlv.c | 52 ++++++++++++++++++++++++++++++++++++
src/simpletlv.h | 13 +++++++++
tests/simpletlv.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 145 insertions(+)
commit fd217efb625524bc3ef8a63245e3d7615fe9e33a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:50 2018 +0200
cac: Emulate also other empty applets; handling multiple COIDs
* These are probably not mandatory, but they are present in real card
* There are two types od them, one of them presents buffers in
properties, but they are empty. The other does not even present
the buffers in properties.
* They do not have any known purpose, but they are on existing cards
* ACF applet has more valid Card Object IDs it answers to on SELECT OID
APDU
* This requires some internal changes of SELECT OID handling, but
currently, we do not have any "useful" data in different OIDs
so we just need to keep the protocol.
* Actually, the data in ACF (Access Control File) are one of the
mandatory parts of CAC, but they are not exposed in PKCS#11
and impossible to emulate (signatures of the internal structures),
but ActivClient does not really need them.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-19-jjelen@redhat.com>
src/cac.c | 376 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/cac.h | 2 +
tests/libcacard.c | 156 +++++++++++++++-------
3 files changed, 482 insertions(+), 52 deletions(-)
commit a35d477e5862d63cf1a8337fcba5b14c9744d2ef
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:49 2018 +0200
tests: Parse the ACA responses to verify their sanity
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-18-jjelen@redhat.com>
tests/libcacard.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 82 insertions(+), 1 deletion(-)
commit 8604d11b41a23773c43c99b0eaa8d066291a328f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:48 2018 +0200
tests: Verify Applet information is present in properties
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-17-jjelen@redhat.com>
tests/libcacard.c | 4 ++++
1 file changed, 4 insertions(+)
commit c9140d39683a2a5652f91d21ec25bc8d95b675c6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:47 2018 +0200
tests: Test standard ISO operations: sign and login
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-16-jjelen@redhat.com>
tests/libcacard.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 99 insertions(+)
commit 922ce9b955131413b780b844f9180aac2edd1f1e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:46 2018 +0200
cac: Generate CardURLs in CCC based on the cert list
* This provides the real list of applets in the emulated card
in the CCC applet CardURLs, which is mandatory for applet and certificated
discovery.
* This also increaseses the amount of possible certificates to 10
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-15-jjelen@redhat.com>
src/cac.c | 78 ++++++++++++++++++++++++++++++++++---------------------
tests/libcacard.c | 2 +-
2 files changed, 50 insertions(+), 30 deletions(-)
commit d8386ee1a98932433f957a1a5eaf3d775878bc87
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:45 2018 +0200
cac: Generate dynamic ACA structures based on the certificates
* So far, the ACA tables were static from existing card.
* This change allows adjusting the ACA tables based on the real
certificates and PKI applets present in virtual smart card
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-14-jjelen@redhat.com>
src/cac-aca.c | 244 +++++++++++++++++++++++++++++++++++++++++-----------------
src/cac-aca.h | 4 +-
src/cac.c | 31 +++++---
3 files changed, 198 insertions(+), 81 deletions(-)
commit d3ad1f6f5999ea4dbbff9b8b511622cd6aa6aa59
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:43 2018 +0200
tests: Get properties with argument selecting only subset of tags
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-12-jjelen@redhat.com>
tests/libcacard.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
commit 44317ac4f8aabc3dbd3e456877aec477c07c38a0
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:42 2018 +0200
cac: Anotate other missing applets
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-11-jjelen@redhat.com>
src/cac.c | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 315 insertions(+)
commit d781bfc984b7ba4d808918137c97f73d407f5b4c
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:41 2018 +0200
tests: Verify cardURLs are present in CCC
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-10-jjelen@redhat.com>
tests/libcacard.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 41 insertions(+), 7 deletions(-)
commit 8a987630222a4766d4ade8002520142db5a12196
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:40 2018 +0200
tests: Check more fields in properties buffers
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-9-jjelen@redhat.com>
tests/libcacard.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 56 insertions(+), 4 deletions(-)
commit 6575011957b31d611dbc9a2cc20a7a812cd53546
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:39 2018 +0200
tests: Test previously introduced applets
* Make sure the GET PROPERTIES APDU returns something that can be parsed
by our SimpleTLV parser
* Make sure the GET ACR APDU returns something reasonable on ACA applet
with valid and invalid parameters
* Make sure the READ BUFFER APDU returns valid buffers
* Validate PKI properties buffer matches the expected key size
* Separate test for GET RESPONSE APDU
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-8-jjelen@redhat.com>
Makefile.am | 6 +-
tests/libcacard.c | 426 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 418 insertions(+), 14 deletions(-)
commit c130d6ca70aab3f32f6e2c03f0c45725cde5a761
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:38 2018 +0200
ACA Applet
* The Access Control Applet is used to discover other applets
in the card, discover Access Control Rules for various opperations
and provides information about authentication mechanisms.
* The ACA provides many structures that are quite independent from
the rest of CAC so it is implemented in separate file.
* All the structures are annotated with the references to specifications
* Implements structures and access functions in ACA Applet
* Access Control Rules table
* Applet/Object Access Control Rules table
* Access Method Provider table
* Service Applet Table
(from "5.3.3.5 Get ACR APDU" of GSC-IS 2.1)
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-7-jjelen@redhat.com>
Makefile.am | 2 +
docs/libcacard.txt | 1 +
src/cac-aca.c | 1106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/cac-aca.h | 32 ++
src/cac.c | 204 ++++++++++
src/cac.h | 12 +
6 files changed, 1357 insertions(+)
commit b2023cede4cabde7ca06b64c1320a20588778062
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:37 2018 +0200
Card Manager Applet
* The card manager applet from Global Platform is common in
Java Cards.
* This commit fixes its location and implement appropriate
responses to APDUs in separate independent file which can
be used in other cards in future.
* The responses to SELECT APDU are still handled in
the generic ISO 7816 code, but the responses are improved.
* This affects also the existing testsuite, which needs
adjustments, since the SELECT APDU retunrs different data.
* This loads the GP applet separately from CAC applet
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-6-jjelen@redhat.com>
Makefile.am | 2 +
docs/libcacard.txt | 1 +
src/cac.c | 41 +++-----------------
src/card_7816.c | 59 ++++++++++++++++++++++++++---
src/gp.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/gp.h | 30 +++++++++++++++
src/vcard_emul_type.c | 11 +++++-
tests/libcacard.c | 10 ++---
8 files changed, 207 insertions(+), 49 deletions(-)
commit 1ee47450fcdb8cdc135bf971371d3e230c5aa7f6
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:36 2018 +0200
CCC Applet implementation
* The Card Capability Container (CCC) is mandatory applet of CAC 2
and is used to discover other applets, card capabilities and
properties
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-5-jjelen@redhat.com>
src/cac.c | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
src/cac.h | 15 +++
2 files changed, 345 insertions(+), 31 deletions(-)
commit f2b58b03d07a404550f89e8835f932b152fb5aa3
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:35 2018 +0200
Adjust PKI Applet to CAC 2
* This involves creation of properties structures in the applet,
that are used to discover pki buffers in the applet and its
properties.
* This also removes the old way of accessing certificates using
GET CERTIFICATE APDU also with the test
* This uses the new function vcard_emul_rsa_bits() to expose the
real key size in properties buffer
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-4-jjelen@redhat.com>
src/cac.c | 474 +++++++++++++++++++++++++++++++++++++++++++++++-------
src/cac.h | 30 +++-
tests/libcacard.c | 26 +--
3 files changed, 439 insertions(+), 91 deletions(-)
commit b56eb2e9fb7b6e000f6b6cdaae63c03b48ce12c2
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:34 2018 +0200
vcard_emul: New function vcard_emul_rsa_bits
* Introduce a new API to get the key size from the key to present it in
CAC properties structures later
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180802094407.4104-3-jjelen@redhat.com>
[ Marc-André - do not export the function ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
docs/libcacard.txt | 4 ++++
src/vcard_emul.h | 1 +
src/vcard_emul_nss.c | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+)
commit b806a9b526c5ceb954ce779bb255601e98aad929
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:50:38 2018 +0200
Set up the CI in gitlab including coverage reports
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
[ Marc-André - simplify, make it work on fdo gitlab ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
.gitlab-ci.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
commit 6b0cbef44d95d5eccff55ff827faaabd4a7d3efc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Thu Aug 2 11:43:33 2018 +0200
tests: Properly terminate the event thread and clean up memory
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Message-Id: <20180802094407.4104-2-jjelen@redhat.com>
[ Marc-André - minor cleanups ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
tests/libcacard.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
commit 0292e76bd1d59b884d7bea08085ef48ff89eea43
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:50:02 2018 +0200
hex_dump: Helper function to allow inspection of internal buffers
The following CAC2 commits are going to use that function for
debugging purposes.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - minor header adjustments ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-9-jjelen@redhat.com>
src/common.c | 41 ++++++++++++++++++++++++++++++++++++++++-
src/common.h | 5 +++++
2 files changed, 45 insertions(+), 1 deletion(-)
commit 420fba15e7ab123dff8c4be80589fabb29624e6a
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:50:01 2018 +0200
simpletlv: Allow clonning of the SimpleTLV structures with test
* This function creates a deep copy of the whole structure.
* The new structure is dynamically allocated and needs to be freed.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731145039.9867-8-jjelen@redhat.com>
src/simpletlv.c | 42 ++++++++++++++++++++++++++++++++++++++++++
src/simpletlv.h | 9 +++++++++
tests/simpletlv.c | 28 ++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
commit 2b63d4e7565de714cc9d4f2648e472ac7e355041
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:50:00 2018 +0200
simpletlv: Add a way to skip unused members
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731145039.9867-7-jjelen@redhat.com>
src/simpletlv.c | 11 +++++++++-
src/simpletlv.h | 5 +++--
tests/simpletlv.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 73 insertions(+), 3 deletions(-)
commit a88fab672fb1f0500ed2ceb3cd1699006c82f4d5
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:49:59 2018 +0200
tests: Cover the SimpleTLV with functional tests
* The CAC is sometimes using nested SimpleTLV structures that might
be ambiguous, which is covered too.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - improve build-sys ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-6-jjelen@redhat.com>
Makefile.am | 14 +++-
docs/libcacard.txt | 1 +
tests/simpletlv.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 220 insertions(+), 2 deletions(-)
commit bd1234f24d5151c55fdd66e9b0bb75fffd95502e
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:49:58 2018 +0200
Basic SimpleTLV encoding and decoding methods
* The source code is originally based on the OpenSC cac card driver
* The SimpleTLV encoding is used in various places of the CAC
cards to encode most of buffers in the card
* The implementation is extended of structures representing the
SimpleTLV objects, that can be either static or dynamically
allocated. The dynamic one need to be recursivelly freed.
* Dynamic structures can be created by mergig other provided structures,
which is common in ACA, where all the responses are prefixed with
applet information.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ build-sys: do not install private headers ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-5-jjelen@redhat.com>
Makefile.am | 4 +
docs/libcacard.txt | 4 +
src/common.c | 49 ++++++++++
src/common.h | 30 ++++++
src/simpletlv.c | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/simpletlv.h | 117 +++++++++++++++++++++++
6 files changed, 476 insertions(+)
commit 3b4b3a3f579c16b696ebb9c8d8ed7b29b4a712eb
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:50:16 2018 +0200
build-sys: Add valgrind supressions for NSS, adjust glib path
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - reference installed glib suppression file ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-23-jjelen@redhat.com>
build-aux/glib-tap.mk | 4 +--
build-aux/nss.supp | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 2 deletions(-)
commit 64920965aea74afb512377142e09e5f10aa28dc9
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:49:57 2018 +0200
build-sys: remove autoconf-archive m4 files
The files are updated by aclocal. Let's require autoconf-archive
instead, to avoid unnecessary maintainance in the git repository (the
m4 files are dist'ed in release tarball).
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
[ Marc-André - updated commit message, update MAINTAINERCLEANFILES ]
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-4-jjelen@redhat.com>
Makefile.am | 3 +-
m4/ax_append_compile_flags.m4 | 65 ------------
m4/ax_append_flag.m4 | 71 -------------
m4/ax_append_link_flags.m4 | 63 -----------
m4/ax_check_compile_flag.m4 | 74 -------------
m4/ax_check_enable_debug.m4 | 124 ----------------------
m4/ax_check_link_flag.m4 | 74 -------------
m4/ax_code_coverage.m4 | 229 ----------------------------------------
m4/ax_compiler_flags.m4 | 158 ---------------------------
m4/ax_compiler_flags_cflags.m4 | 133 -----------------------
m4/ax_compiler_flags_gir.m4 | 60 -----------
m4/ax_compiler_flags_ldflags.m4 | 75 -------------
m4/ax_is_release.m4 | 69 ------------
m4/ax_require_defined.m4 | 37 -------
14 files changed, 2 insertions(+), 1233 deletions(-)
commit 1ba0bd696f051c7deff84c9014a1a3f57f8236c9
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:49:56 2018 +0200
Adjust authorship information
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-3-jjelen@redhat.com>
README.md | 4 ++++
1 file changed, 4 insertions(+)
commit 161218cf410ff7a326ff671a6f4b97c7e3684f04
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 16:49:55 2018 +0200
vimconfig + GSC-IS specification link
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180731145039.9867-2-jjelen@redhat.com>
src/cac.c | 4 ++++
src/card_7816.c | 2 ++
src/vcard_emul_nss.c | 1 +
3 files changed, 7 insertions(+)
commit 33c9a046d32ce3cd62387aa2aed6e25b59971342
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:51 2018 +0200
vcard_emul: Missing cleanup
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-8-jjelen@redhat.com>
src/vcard_emul_nss.c | 1 +
1 file changed, 1 insertion(+)
commit 616083e06369e5dccc5d98b134ac225bc6c8c39f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:50 2018 +0200
typos
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-7-jjelen@redhat.com>
src/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1dd40fbf2df064869e01a9069bfddd9fafb5144f
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:49 2018 +0200
docs: Update documentation to reflect current state, link it from README
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-6-jjelen@redhat.com>
README.md | 2 ++
docs/libcacard.txt | 48 +++++++++++++++++++++++++-----------------------
2 files changed, 27 insertions(+), 23 deletions(-)
commit daca1ff9736b736b042988fc78728f6f649f72f8
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:48 2018 +0200
vscclient: learn to diff with real card for debug
This adds option -p to talk to a real HW smartcard through PCSC
and compare the anser of HW with libcacard.
Original commit from Marc-Andre Lureau rebased to current version:
https://github.com/qemu/qemu/commit/812d2f042d39afdcfce958aba37c04f5b5c34ab5
This also fixes the changeset to build without PCSC support and adds colors
for better oriantation in the differences.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-5-jjelen@redhat.com>
Makefile.am | 4 +-
src/vscclient.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 156 insertions(+), 9 deletions(-)
commit b3c4ecef92b6c56a1743baaa18907655ac755dcf
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:47 2018 +0200
vcard_emul_nss: Avoid memory leaks
* This structure was never freed
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-4-jjelen@redhat.com>
src/vcard_emul_nss.c | 1 +
1 file changed, 1 insertion(+)
commit c38383282b25070f943a9fc07f79ed04ffaa38d1
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:46 2018 +0200
vcard_emul_nss: Do not segfault on bad data
* In case we already know that the card does not know raw RSA
nor the data look like PKCS#1.5, we need to gracefully return.
* If the client passed invalid data, the applications used to
segfault here because of negative length argument to memset().
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-3-jjelen@redhat.com>
src/vcard_emul_nss.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 0d3a683a244b4f2f957e5a0db011342df4c9bd79
Author: Jakub Jelen <jjelen@redhat.com>
Date: Tue Jul 31 11:35:45 2018 +0200
Do not logout after every applet selection
* This ammends the b8ebb12 , which was logging out the current user
on every applet selection, which is more common in CACv2 than in
the first version.
* This change issues the logout only before the login is explicitly
requested, which makes sure the password is properly verified
* This might need some attention
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Robert Relyea <rrelyea@redhat.com>
Message-Id: <20180731093551.10562-2-jjelen@redhat.com>
src/vcard.c | 4 ----
src/vcard_emul_nss.c | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
commit 2803c96e27a38e29a9cdefd51bcf157ac9da7335
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Aug 2 10:54:37 2017 +0200
vscclient: handle ? option
Unknown option fallbacks to '?' case.
Keep the assert(optarg) for scan-build.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1477322
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
src/vscclient.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit aaa5251791bf0b1640afcba77a7d79ea23c42d53
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed Mar 1 16:44:18 2017 +0400
Update NEWS for v2.5.3
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
NEWS | 9 +++++++++
1 file changed, 9 insertions(+)
commit 9113dc6a303604a2d9812ac70c17d076ef11886c
Author: Li Qiang <liq3ea@gmail.com>
Date: Tue Feb 21 22:34:20 2017 -0800
smartcard: fix memory leak in vcard_apdu_new
In the error path, 'new_apdu->a_data' is not freed.
This can be triggered by the guest continuely.
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/card_7816.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ad591057c301d3120c3f7e5a5826342c8bf523bc
Author: Jakub Jelen <jjelen@redhat.com>
Date: Fri Aug 12 11:31:37 2016 +0200
Do not fail, if the caller didn't pick up response from previous call
During our testing of a new CAC driver in OpenSC, with this library, we
encountered a problem with |libcacard| failing and the driver returning
only a fraction of the requested objects.
The problem is that the Emulator wants to return the data (properly
signalized by 61 (RESPONSE BYTES) in SW1), but this is ignored for some
reason in some of our calls from OpenSC. The Emulator should not fail
hard for the next independent request, rather silently drop the buffer
and serve the ongoing APDU request (I would left for consideration to
somehow log such problem).
Patch was successfully tested on Fedora 24 host and solves our problem
(though we worked around the problem already in the driver too).
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/card_7816.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit fede413532c8c786e507388eddb78530473814f6
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Mar 3 01:55:57 2016 +0100
vscclient: help scan-build
scan-build gives a false-positive error because it gets confused that
optarg may be NULL. Help him by adding an assert.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
src/vscclient.c | 2 ++
1 file changed, 2 insertions(+)
commit de542d9d0ac43e0dcb74ce8625fa717e3d093c1a
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Mar 3 01:54:10 2016 +0100
nss: report error on invalid db= argument
The db argument must end with " or \n.
Found thanks to clang scan-build.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
src/vcard_emul_nss.c | 4 ++++
1 file changed, 4 insertions(+)
commit 998db1e88eb8219264476c022d1446f3cb4330e8
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Dec 3 15:29:50 2015 +0100
Remove libcacard.h warning
qemu.git uses -Werror by default, and this is problematic as 2.5.0
doesn't use libcacard.h and it breaks some developpers setup.
Remove the warning and release 2.5.2.
This change can be reverted in a near future (after 2.5.0 release and
a qemu patch is merged?)
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
NEWS | 5 +++++
src/cac.h | 4 ----
src/capcsc.h | 4 ----
src/card_7816.h | 4 ----
src/card_7816t.h | 4 ----
src/eventt.h | 4 ----
src/vcard.h | 4 ----
src/vcard_emul.h | 4 ----
src/vcard_emul_type.h | 4 ----
src/vcardt.h | 4 ----
src/vevent.h | 4 ----
src/vreader.h | 4 ----
src/vreadert.h | 4 ----
src/vscard_common.h | 4 ----
14 files changed, 5 insertions(+), 52 deletions(-)
commit e3e378082d623ec9a9a1f7cf065a1efa0634abd8
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Tue Nov 24 15:32:59 2015 +0100
NEWS: update for 2.5.1 release
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
NEWS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b4a8eb7629053c27e66d9c334f61a58be88f4270
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Tue Nov 24 13:47:32 2015 +0100
Add travis.yml
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
.travis.yml | 25 +++++++++++++++++++++++++
README.md | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
commit 676c6ebfa90d387371197f38a1f78cfeadc67b9a
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Tue Nov 24 13:47:13 2015 +0100
build-sys: build-aux/test-driver is already disted
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Makefile.am | 1 -
1 file changed, 1 deletion(-)
commit d134e0a7a919ac9b0f899966bf1b7a098a75559e
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Tue Nov 24 13:46:32 2015 +0100
build-sys: show correct pcsc summary
Show no if PCSC is disabled
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
configure.ac | 2 ++
1 file changed, 2 insertions(+)
commit 829f914305033a1bdf2f89754904b03d7da99e84
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Nov 19 13:29:15 2015 +0100
libcacard: add G_BEGIN/END_DECLS
If the compiler in use is a C++ compiler, adds extern "C" around the
header.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
src/libcacard.h | 6 ++++++
1 file changed, 6 insertions(+)
commit 09499297fb5a73fe1b6bf080d23e24d897040fd0
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Nov 19 13:28:06 2015 +0100
libcacard: add a warning for libcacard.h inclusion
Only libcacard.h should be included directly.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Makefile.am | 1 +
src/cac.h | 5 +++++
src/capcsc.h | 4 ++++
src/card_7816.h | 4 ++++
src/card_7816t.h | 4 ++++
src/eventt.h | 5 +++++
src/libcacard.h | 2 ++
src/vcard.h | 4 ++++
src/vcard_emul.h | 4 ++++
src/vcard_emul_type.h | 5 +++++
src/vcardt.h | 4 ++++
src/vevent.h | 5 +++++
src/vreader.h | 4 ++++
src/vreadert.h | 4 ++++
src/vscard_common.h | 4 ++++
15 files changed, 59 insertions(+)
commit 2d273ec90f86e94cd18c6e6fc8a531acaa3d40d2
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Thu Nov 19 13:25:03 2015 +0100
Include glib.h in public header
vscard_common.h uses glib G_BYTE_ORDER macros. Include glib.h in the
file, and thus move glib-2.0 as a Require package.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
libcacard.pc.in | 3 ++-
src/vscard_common.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 7efc9cda2f1c908ec6c388c216391fdc1c0dfbfb
Author: Jeremy White <jwhite@codeweavers.com>
Date: Wed Oct 14 09:37:46 2015 -0500
Add m4/pkg.m4 to the list of expected m4 files.
This gets it into the .gitignore, and gets it cleaned
by a maintainer-clean.
Makefile.am | 3 +++
1 file changed, 3 insertions(+)
commit b4a54e79fbf0b869bc92f80b374bd4c5cd8872dc
Author: Jeremy White <jwhite@codeweavers.com>
Date: Wed Oct 14 09:34:44 2015 -0500
Add our own auto foo files to support AX_APPEND_LINK_FLAGS and AX_CHECK_LINK_FLAGS.
m4/ax_append_link_flags.m4 | 63 +++++++++++++++++++++++++++++++++++++++
m4/ax_check_link_flag.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 137 insertions(+)
commit f4f83937383c14982be6e2e71b05c39b9e68a00f
Author: Jeremy White <jwhite@codeweavers.com>
Date: Mon Oct 12 11:05:55 2015 -0500
Add gthread libraries to link flags for the test.
Fixes 'make check' on Debian.
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e8e458f72e6cf1ee88a5314353b7c426621fda2d
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Oct 9 19:27:58 2015 +0200
build-sys: Add git-version-gen to EXTRA_DIST
Without it, running autoreconf -fi from a tarball is going to spew a lot
of warnings about this missing file, and afterwards, ./configure will
generate version-less .pc files.
Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 388cf82d44a753a1dc293b4a40a52d415bdded6e
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Oct 12 11:13:30 2015 +0200
Remove link_test.c
This test was not automated and is now redundant with make check tests
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
docs/libcacard.txt | 1 -
src/link_test.c | 22 ----------------------
2 files changed, 23 deletions(-)
commit 0fcaf1b09e7924804485d82d9b2af38c5f78ebd1
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu Oct 8 17:33:08 2015 +0200
NEWS: update for upcoming 2.5.1
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
NEWS | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 5868de27055019ecf4bad31c57c24afb97c893af
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sat Sep 5 01:32:15 2015 +0200
build-sys: move G_LOG_DOMAIN to CPPFLAGS
So the whole project use the same log domain.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 1 +
src/vreader.c | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
commit 77a128302ca65c17ab9c7b85f4e9777b56a92fa6
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Aug 31 20:26:10 2015 +0200
Add some tests & code coverage
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 31 ++-
build-aux/glib-tap.mk | 150 +++++++++++
build-aux/tap-driver.sh | 652 ++++++++++++++++++++++++++++++++++++++++++++++++
build-aux/tap-test | 5 +
configure.ac | 4 +-
m4/glibtests.m4 | 28 +++
tests/db/cert8.db | Bin 0 -> 65536 bytes
tests/db/key3.db | Bin 0 -> 16384 bytes
tests/db/secmod.db | Bin 0 -> 16384 bytes
tests/libcacard.c | 239 ++++++++++++++++++
10 files changed, 1103 insertions(+), 6 deletions(-)
commit bf81602270d7a45a1bdcd1a7ebfafde5bed6d38b
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Aug 31 20:55:01 2015 +0200
Add libcacard.h
A top-level header file is often easier to deal with for programs
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 1 +
src/libcacard.h | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
commit 3753cf2843c06d65b8560be3bf3753000daf6b52
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Aug 31 20:53:54 2015 +0200
build-sys: do not install vcardt_internal.h
It was not in the exported symbols, so it shouldn't hurt to remove it now.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e387a3212c02da4ffc1349184792c42a5c4a2fd5
Author: Thomas Huth <thuth@linux.vnet.ibm.com>
Date: Thu Mar 19 15:53:50 2015 +0100
libcacard: Fix bug detected with 'smatch'
'smatch' complains about two bugs and one style issue in card_7816.c:
libcacard/card_7816.c:273 vcard_apdu_set_length() warn: should this be a bitwise op?
libcacard/card_7816.c:295 vcard_apdu_set_length() warn: should this be a bitwise op?
libcacard/card_7816.c:661 vcard7816_vm_process_apdu() warn: inconsistent indenting
... and indeed, the code seems to be wrong here. Let's fix this
by using a bitwise OR instead of logical OR and by indenting
the code with the right level.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/card_7816.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 4168dc6c6e25142ebf91ffb621636c9eec6ef8dc
Author: Jeremy White <jwhite@codeweavers.com>
Date: Tue Jan 20 08:46:26 2015 -0600
vscclient: remove the (broken) passthru option
USE_PASSTHRU was not implemented and -p was useless.
That option can be achieved using -e "use_hw=yes hw_type=passthru"
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/vscclient.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
commit 8152a4c01d895ac708886cdd78330c5c7f8f8011
Author: Jeremy White <jwhite@codeweavers.com>
Date: Tue Jan 20 08:42:42 2015 -0600
Enable support for passthru
Enable support for passthru (e.g. direct to pcsc) smart cards in the
emul_options entry point in libcacard.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/vcard_emul_nss.c | 28 +++++++++++++++++++++++++++-
src/vcard_emul_type.c | 3 ++-
2 files changed, 29 insertions(+), 2 deletions(-)
commit 226653d227909294248e91a6e114e1b6207e73bd
Author: Jeremy White <jwhite@codeweavers.com>
Date: Mon Aug 31 19:51:45 2015 +0200
Add a VCARD_DIRECT implemention to the libcacard smartcard support
This uses libpcsclite to provide direct communication with a smartcard.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 9 +-
src/capcsc.c | 501 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/capcsc.h | 18 ++
src/card_7816.c | 2 +-
src/card_7816.h | 4 +-
src/libcacard.syms | 1 +
src/vcard.c | 2 +-
src/vcard.h | 2 +-
src/vcard_emul_nss.c | 11 +-
9 files changed, 542 insertions(+), 8 deletions(-)
commit 97c0121e53a7b835e33e0d34c17de403291d9721
Author: Jeremy White <jwhite@codeweavers.com>
Date: Wed Jan 21 14:46:30 2015 -0600
Add error checking to vcard_emul_options()
Also add an alias of 'nssemul' for the default card
of hw=yes hw_type=cac.
This allows the spice-gtk client to take a more human
friendly set of arguments and relay them through to this code.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/vcard_emul_nss.c | 39 ++++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 11 deletions(-)
commit 6226aa1e4b724bee0e7ba1d21f92bec10a95a901
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Aug 31 19:09:02 2015 +0200
build-sys: add --enable-pcsc
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
configure.ac | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit 264410e0275103319b4e466d151aa409717bc2ca
Author: Jeremy White <jwhite@codeweavers.com>
Date: Mon Jan 19 08:46:35 2015 -0600
Bug fix: delete the reader entry after queueing an event, not before
As far as I can tell, the vreader_remove_reader function is not presently in
use anywhere; I have an upcoming patch set that uses it.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/vreader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e9bb3d2af900c52991b5d3d168908a1375acbb1f
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri Oct 9 16:43:07 2015 +0200
build-sys: update autoconf-archive macros
(alternatively, we could simply require this to be installed, but it's
very recent and the autofoo error is unfriendly)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
m4/ax_append_flag.m4 | 4 ++--
m4/ax_compiler_flags.m4 | 4 ++--
m4/ax_compiler_flags_cflags.m4 | 7 ++++---
m4/ax_compiler_flags_ldflags.m4 | 12 ++++++------
4 files changed, 14 insertions(+), 13 deletions(-)
commit e6eec69ecb5503517193dbaf81d5d3a918a37142
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri Oct 9 13:12:55 2015 +0200
build-sys: vscclient only needs libcacard and gthread/glib
Reported by Michael Tokarev.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e47693ef373453d797dc3ce19d1df52a6ee317df
Author: Fabiano Fidêncio <fidencio@redhat.com>
Date: Wed Oct 7 13:57:25 2015 +0200
mingw: include <winsock2.h> and link to ws2_32
Otherwise the following errors can be faced:
src/vscclient-vscclient.o: In function `send_msg':
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:122: undefined
reference to `_imp__htonl@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:124: undefined
reference to `_imp__htonl@4'
src/vscclient-vscclient.o: In function `on_host_init':
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:260: undefined
reference to `_imp__ntohl@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:273: undefined
reference to `_imp__ntohl@4'
src/vscclient-vscclient.o: In function `do_socket_read':
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:332: undefined
reference to `_imp__ntohl@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:333: undefined
reference to `_imp__ntohl@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:334: undefined
reference to `_imp__ntohl@4'
src/vscclient-vscclient.o: In function `connect_to_qemu':
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:615: undefined
reference to `_imp__socket@12'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:628: undefined
reference to `_imp__getaddrinfo@16'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:636: undefined
reference to `_imp__connect@12'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:645: undefined
reference to `_imp__freeaddrinfo@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:650: undefined
reference to `_imp__freeaddrinfo@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:652: undefined
reference to `_imp__closesocket@4'
src/vscclient-vscclient.o: In function `main':
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:676: undefined
reference to `_imp__WSAStartup@8'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:677: undefined
reference to `_imp__WSAGetLastError@0'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:778: undefined
reference to `_imp__htonl@4'
/home/ffidenci/src/upstream/libcacard/src/vscclient.c:791: undefined
reference to `_imp__closesocket@4'
collect2: error: ld returned 1 exit status
Makefile:656: recipe for target 'vscclient.exe' failed
make[2]: *** [vscclient.exe] Error 1
make[2]: Leaving directory '/home/ffidenci/src/upstream/libcacard'
Makefile:774: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/home/ffidenci/src/upstream/libcacard'
Makefile:495: recipe for target 'all' failed
make: *** [all] Error 2
Makefile.am | 4 ++++
src/vscclient.c | 1 +
2 files changed, 5 insertions(+)
commit 3a1dd01ce6952b3d2d43e8d56e73c9af9a169a18
Author: Fabiano Fidêncio <fidencio@redhat.com>
Date: Mon Oct 5 22:00:46 2015 +0200
mingw: include ws2tcpip header
This header has the definition of getaddrinfo, according to:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms738520(v=vs.85).aspx
src/vscclient.c | 1 +
1 file changed, 1 insertion(+)
commit f59be583fd98c01e1922e23135167ff028adcf96
Author: Fabiano Fidêncio <fidencio@redhat.com>
Date: Wed Oct 7 14:05:09 2015 +0200
mingw: avoid problems for using %zd (C99)
Otherwise the following problem can be faced:
src/vscclient.c: In function 'connect_to_qemu':
src/vscclient.c:642:16: error: unknown conversion type character 'z' in format [-Werror=format=]
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
^
src/vscclient.c:642:16: error: too many arguments for format [-Werror=format-extra-args]
Makefile.am | 4 ++++
configure.ac | 13 +++++++++++++
2 files changed, 17 insertions(+)
commit 99caa07a0b618b6be38a10136ae240a2173aa209
Author: Fabiano Fidêncio <fidencio@redhat.com>
Date: Wed Oct 7 13:32:43 2015 +0200
mingw: remove cac_is_cac_card dead code
Without removing cac_is_cac_card the following error can be faced:
Cannot export cac_is_cac_card: symbol not defined
collect2: error: ld returned 1 exit status
Found a not so old QEMU thread about this:
https://www.mail-archive.com/qemu-devel%40nongnu.org/msg291698.html
src/cac.h | 3 ---
src/libcacard.syms | 1 -
src/vcard_emul_type.c | 6 ------
3 files changed, 10 deletions(-)
commit 7962850cc92e51bae8046d2f505ec71adc97aac4
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Sep 21 15:33:57 2015 +0200
Release v2.5.0
Makefile.am | 1 +
NEWS | 6 ++++++
2 files changed, 7 insertions(+)
commit 213bfd3d96badaba934fdc283ef97871d9307ee7
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue Sep 22 11:58:56 2015 +0200
build-sys: fix linking on rhel6
vscclient needs gthread-2.0, and fails to link on rhel6 without it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 3 ++-
configure.ac | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
commit 108cd963a8025bc7f07093cfef88474141b1d662
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Sep 21 15:26:28 2015 +0200
build-sys: use spice-devel list
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 05a15df955dbcc1eb66bdcab0bf0ef3c4a13e748
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Aug 31 01:01:49 2015 +0200
build-sys: use WARN_CFLAGS/WARN_LDFLAGS and fix errors
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 3 ++-
src/card_7816.c | 4 ++++
src/vcard.c | 4 ++--
src/vcard_emul_nss.c | 9 +++++---
src/vcard_emul_type.c | 3 +++
src/vreader.c | 6 +++--
src/vscard_common.h | 11 ++++++++--
src/vscclient.c | 61 ++++++++++++++++++++++++++++-----------------------
8 files changed, 63 insertions(+), 38 deletions(-)
commit cdc61d0c7b363621ab5883ea2cd35ee9e5238538
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Fri Aug 28 15:17:15 2015 +0200
build-sys: autofoo
autofoo-ize
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Makefile.am | 82 ++++++++++
README.md | 21 +++
autogen.sh | 36 +++++
build-aux/git-version-gen | 225 +++++++++++++++++++++++++++
configure.ac | 30 ++++
git.mk | 333 ++++++++++++++++++++++++++++++++++++++++
libcacard.pc.in | 14 +-
m4/ax_append_compile_flags.m4 | 65 ++++++++
m4/ax_append_flag.m4 | 71 +++++++++
m4/ax_check_compile_flag.m4 | 74 +++++++++
m4/ax_check_enable_debug.m4 | 124 +++++++++++++++
m4/ax_code_coverage.m4 | 229 +++++++++++++++++++++++++++
m4/ax_compiler_flags.m4 | 158 +++++++++++++++++++
m4/ax_compiler_flags_cflags.m4 | 132 ++++++++++++++++
m4/ax_compiler_flags_gir.m4 | 60 ++++++++
m4/ax_compiler_flags_ldflags.m4 | 75 +++++++++
m4/ax_is_release.m4 | 69 +++++++++
m4/ax_require_defined.m4 | 37 +++++
src/Makefile | 45 ------
src/Makefile.am | 1 +
20 files changed, 1828 insertions(+), 53 deletions(-)
commit bfcdf6c71a340c66b9a1e6de0037f1f2376ab6d1
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sat Aug 29 00:45:40 2015 +0200
glib-compat: keep only the required parts
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
src/glib-compat.h | 34 ++--------------------------------
1 file changed, 2 insertions(+), 32 deletions(-)
commit 5ca1b34a2e3390643cf045109535e4ef80e44dee
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Fri Aug 28 15:35:31 2015 +0200
Add COPYING file
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
COPYING | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/cac.c | 2 +-
src/cac.h | 2 +-
src/card_7816.c | 2 +-
src/card_7816.h | 2 +-
src/card_7816t.h | 2 +-
src/event.c | 2 +-
src/eventt.h | 2 +-
src/link_test.c | 2 +-
src/vcard.c | 2 +-
src/vcard.h | 2 +-
src/vcard_emul.h | 2 +-
src/vcard_emul_nss.c | 2 +-
src/vcard_emul_type.c | 2 +-
src/vcard_emul_type.h | 2 +-
src/vcardt.h | 2 +-
src/vevent.h | 2 +-
src/vreader.c | 2 +-
src/vreader.h | 2 +-
src/vreadert.h | 2 +-
src/vscard_common.h | 2 +-
src/vscclient.c | 2 +-
22 files changed, 525 insertions(+), 21 deletions(-)
commit eac1e4a7d11cd8af222cd87cff055ac3879ee31a
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Sat Aug 29 00:40:04 2015 +0200
Moving sources to src
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
libcacard/libcacard.pc.in => libcacard.pc.in | 0
{libcacard => src}/Makefile | 0
{libcacard => src}/cac.c | 0
{libcacard => src}/cac.h | 0
{libcacard => src}/card_7816.c | 0
{libcacard => src}/card_7816.h | 0
{libcacard => src}/card_7816t.h | 0
{libcacard => src}/event.c | 0
{libcacard => src}/eventt.h | 0
{include => src}/glib-compat.h | 0
{libcacard => src}/libcacard.syms | 0
{libcacard => src}/link_test.c | 0
{libcacard => src}/vcard.c | 0
{libcacard => src}/vcard.h | 0
{libcacard => src}/vcard_emul.h | 0
{libcacard => src}/vcard_emul_nss.c | 0
{libcacard => src}/vcard_emul_type.c | 0
{libcacard => src}/vcard_emul_type.h | 0
{libcacard => src}/vcardt.c | 0
{libcacard => src}/vcardt.h | 0
{libcacard => src}/vcardt_internal.h | 0
{libcacard => src}/vevent.h | 0
{libcacard => src}/vreader.c | 0
{libcacard => src}/vreader.h | 0
{libcacard => src}/vreadert.h | 0
{libcacard => src}/vscard_common.h | 0
{libcacard => src}/vscclient.c | 0
27 files changed, 0 insertions(+), 0 deletions(-)
commit 53f38f8f294369c0b6361782f3c8accc562292d4
Author: Veres Lajos <vlajos@gmail.com>
Date: Tue Sep 8 22:45:14 2015 +0100
typofixes - v4
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/card_7816t.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 51fac5ce4b5a10a8cb521b79df72feddd5a8dab3
Author: Daniel P. Berrange <berrange@redhat.com>
Date: Wed Aug 26 12:17:13 2015 +0100
maint: remove / fix many doubled words
Many source files have doubled words (eg "the the", "to to",
and so on). Most of these can simply be removed, but a couple
were actual mis-spellings (eg "to to" instead of "to do").
There was even one triple word score "to to to" :-)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
docs/libcacard.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7abb909f6f4d6475a358fb06a80634bebb836455
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Wed Jun 17 21:02:03 2015 +0300
libcacard: pkgconfig: tidy dependent libs
libcacard.pc file lists only one package in Requires
field, which is nss, while glib-2.0 is also a requiriment.
Furthermore, for libraries used internally by the library
(this is the way nss and glib are used by libcacard),
Requires.private shold be used instead of Requires.
Fix both issues.
This does not affect linking of qemu because it links
with objects from libcacard directly.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/libcacard.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 269ac769ece9053ccc63a8da00184f4f641ae015
Author: John Snow <jsnow@redhat.com>
Date: Fri May 22 14:13:42 2015 -0400
glib: remove stale compat functions
Since we're bumping the version to 2.22+,
remove the now-stale compat functions.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1431469140-22208-2-git-send-email-jsnow@redhat.com
include/glib-compat.h | 35 -----------------------------------
1 file changed, 35 deletions(-)
commit 8422d073b3788ad6968b5ba3ab1947656e50bdfe
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 7 13:38:02 2015 +0300
glib-compat.h: change assert to g_assert
include/glib-compat.h defines a bunch of functions based on glib primitives,
and uses assert() without including assert.h. Replace assert() with
g_assert() to make the file more self-contained, and to fix compilation
breakage after 28507a415a9b1e.
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>
include/glib-compat.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 65545be0cd91eca53bc539c8cc9fae01a60bcdd2
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Mon Apr 27 16:29:58 2015 +0300
libcacard: do not use full paths for include files in the same dir
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/vcard_emul_nss.c | 2 +-
libcacard/vcardt.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 5b27f34cfb3160ad0b83588a9e0821a59630fc14
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon Apr 27 12:34:18 2015 +0200
libcacard: stop including qemu-common.h
This is a small step towards making libcacard standalone.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/cac.c | 5 ++++-
libcacard/card_7816.c | 4 +++-
libcacard/event.c | 2 +-
libcacard/vcard.c | 4 +++-
libcacard/vcard_emul_nss.c | 2 +-
libcacard/vreader.c | 4 +++-
libcacard/vscclient.c | 8 +++++++-
7 files changed, 22 insertions(+), 7 deletions(-)
commit 439b24559c74982ec43dc7e99cd45ff050aae7d5
Author: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Thu Apr 2 17:17:45 2015 +0200
glib-compat: fix problems with not-quite glib 2.22
Commit 89b516d8b9444ece8ccabb322a9389587c7a7b83 ("glib: add
compatibility interface for g_get_monotonic_time()") aimed
at making qemu build with old glib versions. At least SLES11SP3,
however, contains a backport of g_get_monotonic_time() while
keeping the reported glib version at 2.22.
Let's work around this by a strategically placed #define.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1427987865-433-2-git-send-email-cornelia.huck@de.ibm.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
include/glib-compat.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 7c12cf892ed3c2cd6a2a276114d68906da9bcd40
Author: Daniel P. Berrange <berrange@redhat.com>
Date: Tue Feb 3 11:31:30 2015 +0000
libcacard: stop linking against every single 3rd party library
Building QEMU results in a libcacard.so that links against
practically the entire world
linux-vdso.so.1 => (0x00007fff71e99000)
libssl3.so => /usr/lib64/libssl3.so (0x00007f49f94b6000)
libsmime3.so => /usr/lib64/libsmime3.so (0x00007f49f928e000)
libnss3.so => /usr/lib64/libnss3.so (0x00007f49f8f67000)
libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f49f8d3b000)
libplds4.so => /usr/lib64/libplds4.so (0x00007f49f8b36000)
libplc4.so => /usr/lib64/libplc4.so (0x00007f49f8931000)
libnspr4.so => /usr/lib64/libnspr4.so (0x00007f49f86f2000)
libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f49f84ed000)
libm.so.6 => /usr/lib64/libm.so.6 (0x00007f49f81e5000)
libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f49f7fe3000)
librt.so.1 => /usr/lib64/librt.so.1 (0x00007f49f7dda000)
libz.so.1 => /usr/lib64/libz.so.1 (0x00007f49f7bc4000)
libcap-ng.so.0 => /usr/lib64/libcap-ng.so.0 (0x00007f49f79be000)
libuuid.so.1 => /usr/lib64/libuuid.so.1 (0x00007f49f77b8000)
libgnutls.so.28 => /usr/lib64/libgnutls.so.28 (0x00007f49f749a000)
libSDL-1.2.so.0 => /usr/lib64/libSDL-1.2.so.0 (0x00007f49f71fd000)
libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f49f6fe0000)
libvte.so.9 => /usr/lib64/libvte.so.9 (0x00007f49f6d3f000)
libXext.so.6 => /usr/lib64/libXext.so.6 (0x00007f49f6b2d000)
libgtk-x11-2.0.so.0 => /usr/lib64/libgtk-x11-2.0.so.0 (0x00007f49f64a0000)
libgdk-x11-2.0.so.0 => /usr/lib64/libgdk-x11-2.0.so.0 (0x00007f49f61de000)
libpangocairo-1.0.so.0 => /usr/lib64/libpangocairo-1.0.so.0 (0x00007f49f5fd1000)
libatk-1.0.so.0 => /usr/lib64/libatk-1.0.so.0 (0x00007f49f5daa000)
libcairo.so.2 => /usr/lib64/libcairo.so.2 (0x00007f49f5a9d000)
libgdk_pixbuf-2.0.so.0 => /usr/lib64/libgdk_pixbuf-2.0.so.0 (0x00007f49f5878000)
libgio-2.0.so.0 => /usr/lib64/libgio-2.0.so.0 (0x00007f49f5500000)
libpangoft2-1.0.so.0 => /usr/lib64/libpangoft2-1.0.so.0 (0x00007f49f52eb000)
libpango-1.0.so.0 => /usr/lib64/libpango-1.0.so.0 (0x00007f49f50a0000)
libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0 (0x00007f49f4e4e000)
libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f49f4b15000)
libfontconfig.so.1 => /usr/lib64/libfontconfig.so.1 (0x00007f49f48d6000)
libfreetype.so.6 => /usr/lib64/libfreetype.so.6 (0x00007f49f462b000)
libX11.so.6 => /usr/lib64/libX11.so.6 (0x00007f49f42e8000)
libxenstore.so.3.0 => /usr/lib64/libxenstore.so.3.0 (0x00007f49f40de000)
libxenctrl.so.4.4 => /usr/lib64/libxenctrl.so.4.4 (0x00007f49f3eb6000)
libxenguest.so.4.4 => /usr/lib64/libxenguest.so.4.4 (0x00007f49f3c8b000)
libseccomp.so.2 => /usr/lib64/libseccomp.so.2 (0x00007f49f3a74000)
librdmacm.so.1 => /usr/lib64/librdmacm.so.1 (0x00007f49f385d000)
libibverbs.so.1 => /usr/lib64/libibverbs.so.1 (0x00007f49f364a000)
libutil.so.1 => /usr/lib64/libutil.so.1 (0x00007f49f3447000)
libc.so.6 => /usr/lib64/libc.so.6 (0x00007f49f3089000)
/lib64/ld-linux-x86-64.so.2 (0x00007f49f9902000)
libp11-kit.so.0 => /usr/lib64/libp11-kit.so.0 (0x00007f49f2e23000)
libtspi.so.1 => /usr/lib64/libtspi.so.1 (0x00007f49f2bb2000)
libtasn1.so.6 => /usr/lib64/libtasn1.so.6 (0x00007f49f299f000)
libnettle.so.4 => /usr/lib64/libnettle.so.4 (0x00007f49f276d000)
libhogweed.so.2 => /usr/lib64/libhogweed.so.2 (0x00007f49f2545000)
libgmp.so.10 => /usr/lib64/libgmp.so.10 (0x00007f49f22cd000)
libncurses.so.5 => /usr/lib64/libncurses.so.5 (0x00007f49f20a5000)
libtinfo.so.5 => /usr/lib64/libtinfo.so.5 (0x00007f49f1e7a000)
libgmodule-2.0.so.0 => /usr/lib64/libgmodule-2.0.so.0 (0x00007f49f1c76000)
libXfixes.so.3 => /usr/lib64/libXfixes.so.3 (0x00007f49f1a6f000)
libXrender.so.1 => /usr/lib64/libXrender.so.1 (0x00007f49f1865000)
libXinerama.so.1 => /usr/lib64/libXinerama.so.1 (0x00007f49f1662000)
libXi.so.6 => /usr/lib64/libXi.so.6 (0x00007f49f1452000)
libXrandr.so.2 => /usr/lib64/libXrandr.so.2 (0x00007f49f1247000)
libXcursor.so.1 => /usr/lib64/libXcursor.so.1 (0x00007f49f103c000)
libXcomposite.so.1 => /usr/lib64/libXcomposite.so.1 (0x00007f49f0e39000)
libXdamage.so.1 => /usr/lib64/libXdamage.so.1 (0x00007f49f0c35000)
libharfbuzz.so.0 => /usr/lib64/libharfbuzz.so.0 (0x00007f49f09dd000)
libpixman-1.so.0 => /usr/lib64/libpixman-1.so.0 (0x00007f49f072f000)
libEGL.so.1 => /usr/lib64/libEGL.so.1 (0x00007f49f0505000)
libpng16.so.16 => /usr/lib64/libpng16.so.16 (0x00007f49f02d2000)
libxcb-shm.so.0 => /usr/lib64/libxcb-shm.so.0 (0x00007f49f00cd000)
libxcb-render.so.0 => /usr/lib64/libxcb-render.so.0 (0x00007f49efec3000)
libxcb.so.1 => /usr/lib64/libxcb.so.1 (0x00007f49efca1000)
libGL.so.1 => /usr/lib64/libGL.so.1 (0x00007f49efa06000)
libffi.so.6 => /usr/lib64/libffi.so.6 (0x00007f49ef7fe000)
libselinux.so.1 => /usr/lib64/libselinux.so.1 (0x00007f49ef5d8000)
libresolv.so.2 => /usr/lib64/libresolv.so.2 (0x00007f49ef3be000)
libexpat.so.1 => /usr/lib64/libexpat.so.1 (0x00007f49ef193000)
libbz2.so.1 => /usr/lib64/libbz2.so.1 (0x00007f49eef83000)
libgcc_s.so.1 => /usr/lib64/libgcc_s.so.1 (0x00007f49eed6c000)
liblzma.so.5 => /usr/lib64/liblzma.so.5 (0x00007f49eeb46000)
libnl-route-3.so.200 => /usr/lib64/libnl-route-3.so.200 (0x00007f49ee8e2000)
libnl-3.so.200 => /usr/lib64/libnl-3.so.200 (0x00007f49ee6c4000)
libcrypto.so.10 => /usr/lib64/libcrypto.so.10 (0x00007f49ee2d6000)
libssl.so.10 => /usr/lib64/libssl.so.10 (0x00007f49ee067000)
libgraphite2.so.3 => /usr/lib64/libgraphite2.so.3 (0x00007f49ede48000)
libX11-xcb.so.1 => /usr/lib64/libX11-xcb.so.1 (0x00007f49edc46000)
libxcb-dri2.so.0 => /usr/lib64/libxcb-dri2.so.0 (0x00007f49eda41000)
libxcb-xfixes.so.0 => /usr/lib64/libxcb-xfixes.so.0 (0x00007f49ed838000)
libxcb-shape.so.0 => /usr/lib64/libxcb-shape.so.0 (0x00007f49ed634000)
libgbm.so.1 => /usr/lib64/libgbm.so.1 (0x00007f49ed426000)
libwayland-client.so.0 => /usr/lib64/libwayland-client.so.0 (0x00007f49ed217000)
libwayland-server.so.0 => /usr/lib64/libwayland-server.so.0 (0x00007f49ed005000)
libglapi.so.0 => /usr/lib64/libglapi.so.0 (0x00007f49ecddb000)
libdrm.so.2 => /usr/lib64/libdrm.so.2 (0x00007f49ecbce000)
libXau.so.6 => /usr/lib64/libXau.so.6 (0x00007f49ec9ca000)
libxcb-glx.so.0 => /usr/lib64/libxcb-glx.so.0 (0x00007f49ec7b0000)
libxcb-dri3.so.0 => /usr/lib64/libxcb-dri3.so.0 (0x00007f49ec5ad000)
libxcb-present.so.0 => /usr/lib64/libxcb-present.so.0 (0x00007f49ec3aa000)
libxcb-randr.so.0 => /usr/lib64/libxcb-randr.so.0 (0x00007f49ec19b000)
libxcb-sync.so.1 => /usr/lib64/libxcb-sync.so.1 (0x00007f49ebf94000)
libxshmfence.so.1 => /usr/lib64/libxshmfence.so.1 (0x00007f49ebd91000)
libXxf86vm.so.1 => /usr/lib64/libXxf86vm.so.1 (0x00007f49ebb8a000)
libpcre.so.1 => /usr/lib64/libpcre.so.1 (0x00007f49eb91d000)
libgssapi_krb5.so.2 => /usr/lib64/libgssapi_krb5.so.2 (0x00007f49eb6cf000)
libkrb5.so.3 => /usr/lib64/libkrb5.so.3 (0x00007f49eb3ec000)
libcom_err.so.2 => /usr/lib64/libcom_err.so.2 (0x00007f49eb1e8000)
libk5crypto.so.3 => /usr/lib64/libk5crypto.so.3 (0x00007f49eafb4000)
libkrb5support.so.0 => /usr/lib64/libkrb5support.so.0 (0x00007f49eada5000)
libkeyutils.so.1 => /usr/lib64/libkeyutils.so.1 (0x00007f49eaba0000)
All libcacard actually needs are the NSS libs. Linking against the entire
world is a regression caused by
commit 9d171bd9375e4d08feff9adda15163e0811f5f42
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 16:48:27 2014 +0400
libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
Which removed the setting of the LIBS variable in libcacard/Makefile.
Adding it back as an empty assignment brings the linked libs back to a more
reasonable set
linux-vdso.so.1 => (0x00007fff575c1000)
libssl3.so => /usr/lib64/libssl3.so (0x00007f7f753b1000)
libsmime3.so => /usr/lib64/libsmime3.so (0x00007f7f75189000)
libnss3.so => /usr/lib64/libnss3.so (0x00007f7f74e62000)
libnssutil3.so => /usr/lib64/libnssutil3.so (0x00007f7f74c36000)
libplds4.so => /usr/lib64/libplds4.so (0x00007f7f74a31000)
libplc4.so => /usr/lib64/libplc4.so (0x00007f7f7482c000)
libnspr4.so => /usr/lib64/libnspr4.so (0x00007f7f745ed000)
libpthread.so.0 => /usr/lib64/libpthread.so.0 (0x00007f7f743d0000)
libdl.so.2 => /usr/lib64/libdl.so.2 (0x00007f7f741cc000)
libgthread-2.0.so.0 => /usr/lib64/libgthread-2.0.so.0 (0x00007f7f73fca000)
libglib-2.0.so.0 => /usr/lib64/libglib-2.0.so.0 (0x00007f7f73c90000)
libc.so.6 => /usr/lib64/libc.so.6 (0x00007f7f738d3000)
libz.so.1 => /usr/lib64/libz.so.1 (0x00007f7f736bd000)
librt.so.1 => /usr/lib64/librt.so.1 (0x00007f7f734b4000)
/lib64/ld-linux-x86-64.so.2 (0x00007f7f757fd000)
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Cc: <qemu-stable@nongnu.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/Makefile | 2 ++
1 file changed, 2 insertions(+)
commit 50fc1c5dd931c82c166c051f287858bd98910851
Author: zhanghailiang <zhang.zhanghailiang@huawei.com>
Date: Fri Nov 14 10:18:08 2014 +0800
libcacard: fix resource leak
In function connect_to_qemu(), getaddrinfo() will allocate memory
that is stored into server, it should be freed by using freeaddrinfo()
before connect_to_qemu() return.
Cc: qemu-stable@nongnu.org
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/vscclient.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 43d84715e28eac517ad36af4b396f47b00895be1
Author: Ray Strode <rstrode@redhat.com>
Date: Sat Oct 18 22:12:49 2014 -0400
libcacard: don't free sign buffer while sign op is pending
commit 57f97834efe0c208ffadc9d2959f3d3d55580e52 cleaned up
the cac_applet_pki_process_apdu function to have a single
exit point. Unfortunately, that commit introduced a bug
where the sign buffer can get free'd and nullified while
it's still being used.
This commit corrects the bug by introducing a boolean to
track whether or not the sign buffer should be freed in
the function exit path.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Alon Levy <alon@pobox.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
libcacard/cac.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit b8ebb126188a07a4a5259cb2be72ffe7c1253b00
Author: Ray Strode <rstrode@redhat.com>
Date: Sat Oct 18 22:12:48 2014 -0400
libcacard: Lock NSS cert db when selecting an applet on an emulated card
When a process in a guest uses an emulated smartcard, libcacard running
on the host passes the PIN from the guest to the PK11_Authenticate NSS
function. The first time PK11_Authenticate is called the passed in PIN
is used to unlock the certificate database. Subsequent calls to
PK11_Authenticate will transparently succeed, regardless of the passed in
PIN. This is a convenience for applications provided by NSS.
Of course, the guest may have many applications using the one emulated
smart card all driven from the same host QEMU process. That means if a
user enters the right PIN in one program in the guest, and then enters the
wrong PIN in another program in the guest, the wrong PIN will still
successfully unlock the virtual smartcard.
This commit forces the NSS certificate database to be locked anytime an
applet is selected on an emulated smartcard by calling vcard_emul_logout.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-By: Robert Relyea <rrelyea@redhat.com>
Reviewed-By: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
libcacard/vcard.c | 5 +++++
1 file changed, 5 insertions(+)
commit 79ceb49a465c7463a9fdfed17c8b89bfab9d1bbb
Author: Ray Strode <rstrode@redhat.com>
Date: Sat Oct 18 22:12:47 2014 -0400
libcacard: introduce new vcard_emul_logout
vcard_emul_reset currently only logs NSS out, but there is a TODO
for potentially sending insertion/removal events when powering down
or powering up.
For clarity, this commit moves the current guts of vcard_emul_reset to
a new vcard_emul_logout function which will never send insertion/removal
events. The vcard_emul_reset function now just calls vcard_emul_logout,
but also retains its TODO for watching power state transitions and sending
insertion/removal events.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-By: Robert Relyea <rrelyea@redhat.com>
Reviewed-By: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
libcacard/vcard_emul.h | 1 +
libcacard/vcard_emul_nss.c | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
commit 3eb04435ba0f632c404c3f79d47aadbb423916b1
Author: Gonglei <arei.gonglei@huawei.com>
Date: Thu Oct 16 18:59:37 2014 +0800
glib: add compatibility interface for g_strcmp0()
This patch fixes compilation errors when building against glib < 2.16.0
due to the missing g_strcmp0() function.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Message-id: 1413457177-10132-1-git-send-email-arei.gonglei@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
include/glib-compat.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
commit 52ebbfed3985ac86e2f3865e05d534ef6df4ee7e
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: Wed Oct 15 14:29:30 2014 +0200
glib: add compatibility interface for g_get_monotonic_time()
This patch fixes compilation errors when building against glib <2.28.0
due to the missing g_get_monotonic_time() function.
The compilation error in tests/libqos/virtio.c was introduced in commit
70556264a89a268efba1d7e8e341adcdd7881eb4 ("libqos: use microseconds
instead of iterations for virtio timeout").
Add a simple g_get_monotonic_time() implementation to glib-compat.h
based on code from vhost-user-test.c.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
[Igor: add G_TIME_SPAN_SECOND, include glib-compat.h in libqtest.h]
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
include/glib-compat.h | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
commit 41875913fd8f96f09c19cbde4453f9fd05163550
Author: zhanghailiang <zhang.zhanghailiang@huawei.com>
Date: Wed Sep 10 19:29:07 2014 +0800
Fix typos and misspellings in comments
formated -> formatted
gaurantee -> guarantee
shear -> sheer
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit f278a796096814d74fcca903e043e5fd2f55e60c
Author: Ed Maste <emaste@freebsd.org>
Date: Wed Jun 18 08:58:00 2014 -0400
vscclient: Add required headers to fix build on FreeBSD
Signed-off-by: Ed Maste <emaste@freebsd.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vscclient.c | 2 ++
1 file changed, 2 insertions(+)
commit c1f1260170a08d94eeba6f07570876edf3895a8d
Merge: 4a91e43 39d7a20
Author: Peter Maydell <peter.maydell@linaro.org>
Date: Wed Jun 11 15:36:48 2014 +0100
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure:
rules.mak: Rewrite unnest-vars
configure: unset interfering variables
configure: duplicate/incorrect order of -lrt
libcacard: improve documentation
libcacard: actually use symbols file
libcacard: replace qemu thread primitives with glib ones
vscclient: use glib thread primitives not qemu
glib-compat.h: add new thread API emulation on top of pre-2.31 API
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
commit 4a91e43fc3e78e92f67dbbe354d711d4356f1acb
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri Jun 6 21:30:32 2014 +0200
libcacard: Clean up dead stores before g_free()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard.c | 4 ----
libcacard/vreader.c | 2 --
2 files changed, 6 deletions(-)
commit 796a87ab094b05338ca9130305769bd922d7bd68
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri Jun 6 18:32:08 2014 +0200
libcacard: Drop superfluous conditionals around g_free()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/cac.c | 14 ++++----------
libcacard/card_7816.c | 12 +++---------
libcacard/vcard.c | 10 +++-------
libcacard/vcard_emul_nss.c | 4 +---
libcacard/vreader.c | 4 +---
5 files changed, 12 insertions(+), 32 deletions(-)
commit 39d7a20eb4e9b93eef61ac3d058b17f0e3bfa3c2
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 12:30:49 2014 +0400
libcacard: actually use symbols file
libtool has an argument for .syms file, which is -export-symbols.
There's no argument `-export-syms', and it looks like at least on
linux, -export-syms is just ignored. Use the correct argument,
-export-symbols, to actually get the right export list.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Alon Levy <alevy@redhat.com>
Tested-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c72564ff3ea0fb435c52165a28c7c5a4aab693ea
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 12:30:48 2014 +0400
libcacard: replace qemu thread primitives with glib ones
Replace QemuMutex with GMutex and QemuCond with GCond
(with corresponding function changes), to make libcacard
independent of qemu internal functions.
After this step, none of libcacard internals use any
qemu-provided symbols. Maybe it's a good idea to
stop including qemu-common.h internally too.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Alon Levy <alevy@redhat.com>
Tested-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 8 +-------
libcacard/event.c | 23 ++++++++++-------------
libcacard/vreader.c | 18 ++++++++----------
3 files changed, 19 insertions(+), 30 deletions(-)
commit b10c7c00480a8177aced46e656a8e66a35989bb3
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 12:30:47 2014 +0400
vscclient: use glib thread primitives not qemu
Use glib-provided thread primitives in vscclient instead of
qemu ones, and do not use qemu sockets in there (open-code
call to WSAStartup() for windows to initialize things).
This way, vscclient becomes more stand-alone, independent on
qemu internals.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Alon Levy <alevy@redhat.com>
Tested-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/vscclient.c | 70 +++++++++++++++++++++++++++------------------------
1 file changed, 37 insertions(+), 33 deletions(-)
commit 08c45a139764952579b7d7781380ffa5ea3d284f
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 12:30:46 2014 +0400
glib-compat.h: add new thread API emulation on top of pre-2.31 API
Thread API changed in glib-2.31 significantly. Before that version,
conditionals and mutexes were only allocated dynamically, using
_new()/_free() interface. in 2.31 and up, they're allocated statically
as regular variables, and old interface is deprecated.
(Note: glib docs says the new interface is available since version
2.32, but it was actually introduced in version 2.31).
Create the new interface using old primitives, by providing non-opaque
definitions of the base types (GCond and GMutex) using GOnces.
Replace #ifdeffery around GCond and GMutex in trace/simple.c and
coroutine-gthread.c too because it does not work anymore with the new
glib-compat.h.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[Use GOnce to support lazy initialization; introduce CompatGMutex
and CompatGCond. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
include/glib-compat.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
commit b85dd1fe88134faf4d8318730a8e36a5a7c16f06
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 21:17:38 2014 +0400
libcacard: remove useless initializers
libcacard has many functions which initializes local variables
at declaration time, which are always assigned some values later
(often right after declaration). Clean up these initializers.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/cac.c | 14 +++++++-------
libcacard/card_7816.c | 5 ++---
libcacard/vcard.c | 4 ++--
libcacard/vcard_emul_nss.c | 6 +++---
libcacard/vreader.c | 10 +++++-----
libcacard/vscclient.c | 4 ++--
6 files changed, 21 insertions(+), 22 deletions(-)
commit 0b25d4b57a3090a87c797623f6c6b9e46e51cd4b
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Sat May 24 00:47:39 2014 +0400
libcacard: fix wrong array expansion logic
The currrent code in libcacard/vcard_emul_nss.c:vcard_emul_options()
has a weird bug in variable usage around expanding opts->vreader
array.
There's a helper variable, vreaderOpt, which is first needlessly
initialized to NULL, next, conditionally, only we have to expand
opts->vreader, receives array expansion from g_renew(), and next,
even if we don't actually perform expansion, the value of this
variable is assigned to the actual array, opts->vreader, which
was supposed to be expanded.
So, since we expand the array by READER_STEP increments, only
once in READER_STEP (=4) the code will work, in other 3/4 times
it will fail badly.
Fix this by not using this temp variable when expanding the
array, and by dropping the useless =NULL initializer too -
if it wasn't in place initially, compiler would have warned
us about this problem at the beginning.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
libcacard/vcard_emul_nss.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
commit eee39377c094fbb01ff324b3560f75b1f18f0918
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:39 2014 +0200
libcacard/vcard_emul_nss: Drop a redundant conditional
Bailing out when PK11_FindGenericObjects() returns null ensures the
loop that follows it executes at least once. The "loop did not
execute" test right after it is useless. Drop it.
Spotted by Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c | 5 -----
1 file changed, 5 deletions(-)
commit f2cca7a1a10833cde5ebd1ddd7cd12a907c8b5df
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:37 2014 +0200
libcacard: Convert two leftover realloc() to GLib
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/cac.c | 13 ++-----------
libcacard/vcard_emul_nss.c | 7 ++-----
2 files changed, 4 insertions(+), 16 deletions(-)
commit 523878fd3f7792accc6d4c82e0af3472909d2e5a
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:36 2014 +0200
libcacard/vreader: Tighten assertion to clarify intent
Bonus: hushes up Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vreader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a9d8c78f6fb2de442e1e7a2dd2517d465088a212
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:35 2014 +0200
libcacard/vreader: Drop broken recovery from failed assertion
We suppress some code when we got unexpected status and assertion
checking is off:
assert(card_status == VCARD_DONE);
if (card_status == VCARD_DONE) {
int size = MIN(*receive_buf_len, response->b_total_len);
memcpy(receive_buf, response->b_data, size);
*receive_buf_len = size;
}
Such "recovery" is of dubious value even when it works. This one
doesn't: it fails to assign to receive_buf[] and *receive_buf_len,
which the callers expect.
Make the code unconditional.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vreader.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
commit 88952ad5c967760fdea75f8309a4c8b908c7f5ee
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:34 2014 +0200
libcacard: Plug memory leaks around vreader_get_reader_list()
Spotted by Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c | 4 ++++
libcacard/vscclient.c | 1 +
2 files changed, 5 insertions(+)
commit 1c81ad3eb801673f6349f35023d11b3de6c50e4a
Author: Markus Armbruster <armbru@redhat.com>
Date: Fri May 23 13:24:33 2014 +0200
libcacard/vscclient: Bury some dead code
Spotted by Coverity.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vscclient.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit 199d4d9b90ebfcf725a6be2886f2c02113ba7200
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 19:51:01 2014 +0400
libcacard: g_malloc cleanups
This patch replaces g_malloc() in libcacard into g_new()
or g_new0() where appropriate (removing some init-to-zero
surrounding code), g_malloc+memcpy into g_memdup() and the
like.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/cac.c | 11 +++--------
libcacard/card_7816.c | 11 +++++------
libcacard/event.c | 2 +-
libcacard/vcard.c | 22 +++++-----------------
libcacard/vcard_emul_nss.c | 12 ++++++------
libcacard/vreader.c | 11 +++--------
6 files changed, 23 insertions(+), 46 deletions(-)
commit c55870a6f5863754bc53a76babeac910ff1531fb
Merge: b7e8415 5a56946
Author: Peter Maydell <peter.maydell@linaro.org>
Date: Tue May 13 11:30:07 2014 +0100
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure:
libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
build: simplify and fix fix-obj-vars
build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax
build: add support for per-object -cflags and -libs to all rules
Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG)
Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL)
Makefile: strip tools and modules too
build: simplify Makefile.target around unnest-vars invocations
build: simplify Makefile.target a bit, use just one rule for softmmu
build: Fix per-object variables for Makefile.target
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
commit 5a569468fd660a433a2cc865016eb977d0c669cf
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Thu May 8 16:48:27 2014 +0400
libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
Currently all what's needed for single file libcacard/vcard_emul_nss.c
(libnss cflags) and hw/usb/ccid-card-emulated.c (libcacard includes)
together with the libs is added to global QEMU_CFLAGS and libs_softmmu.
Use the cflags only where really used (for two mentioned files), and
libs only where needed.
While at it, rename variables to better reflect reality: libcacard_*
is really nss_*.
This needs a bit more tweaking: $(NSS_LIBS) should not contain $glib_libs
(ditto for _cflags). But in order to fix it, some more preparations
should be made first. So add a FIXME comment.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 1 -
1 file changed, 1 deletion(-)
commit b7e8415de3cc39fbddf4f484dc9cb9ed1203d4ff
Author: Sangho Park <sangho1206.park@samsung.com>
Date: Thu May 8 12:47:10 2014 +0400
glib: fix g_poll early timeout on windows
g_poll has a problem on Windows when using
timeouts < 10ms, in glib/gpoll.c:
/* If not, and we have a significant timeout, poll again with
* timeout then. Note that this will return indication for only
* one event, or only for messages. We ignore timeouts less than
* ten milliseconds as they are mostly pointless on Windows, the
* MsgWaitForMultipleObjectsEx() call will timeout right away
* anyway.
*/
if (retval == 0 && (timeout == INFINITE || timeout >= 10))
retval = poll_rest (poll_msgs, handles, nhandles, fds, nfds, timeout);
so whenever g_poll is called with timeout < 10ms it does
a quick poll instead of wait, this causes significant performance
degradation of QEMU, thus we should use WaitForMultipleObjectsEx
directly
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
include/glib-compat.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 4169cfbfec755af08454c855f8cb8c5663429d3d
Author: Alon Levy <alevy@redhat.com>
Date: Mon May 5 17:41:32 2014 +0300
libcacard: remove unnecessary EOL from debug prints
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vreader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9fd7072a59336e4a0d913b39e0371135d20a79f0
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Fri May 2 18:35:59 2014 +0400
libcacard: replace pstrcpy() with memcpy()
Commit 2e679780ae86c6ca8 replaced strncpy() with pstrcpy()
in one place in libcacard. This is a qemu-specific function,
while libcacard is a stand-alone library (or tries to be).
But since we know the exact length of the string to copy,
and know that it definitely will fit in the destination
buffer, use memcpy() instead, and null-terminate the string
after that.
An alternative is to use g_strlcpy() or strncpy(), but memcpy()
is more than adequate in this place.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: qemu-trivial@nongnu.org
Cc: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 322619a50f29bd578d6c2d0fcbc1f76d35c91f96
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: Fri May 2 18:35:56 2014 +0400
glib: move g_poll() replacement into glib-compat.h
We have a dedicated header file for wrappers to smooth over glib version
differences. Move the g_poll() definition into glib-compat.h for
consistency.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: qemu-trivial@nongnu.org
include/glib-compat.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 7ca871a93cefdb7a01ec44bffd240b015b4b36d2
Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Thu Jan 30 10:20:32 2014 +0000
Add a 'name' parameter to qemu_thread_create
If enabled, set the thread name at creation (on GNU systems with
pthread_set_np)
Fix up all the callers with a thread name
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
libcacard/vscclient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c8a8d48ddc1f304b585d652b564425f4b5c1dae2
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Thu Jan 30 14:56:49 2014 +0100
libcacard: Don't link with all libraries QEMU links to
As described in https://bugzilla.redhat.com/show_bug.cgi?id=987441 ,
libcacard currently links to all the libraries QEMU is linking to,
including glusterfs libraries, libiscsi, ... libcacard does not need all of
these. This patch ensures it's only linked with the libraries it needs.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b4d8743e46f3db1ca412821f9408e9e8434f6705
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun Dec 1 22:23:35 2013 +0100
vscclient: do not add a socket watch if there is not data to send
Fixes the following error:
** (process:780): CRITICAL **: do_socket_send: assertion
`socket_to_send->len != 0' failed
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
libcacard/vscclient.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 80acda8fcf32ec4f8f95c263b76cccc8b6f371ed
Author: Stefan Weil <sw@weilnetz.de>
Date: Thu Dec 5 19:41:28 2013 +0100
libcacard: Fix compilation for older versions of glib (bug #1258168)
See https://bugs.launchpad.net/bugs/1258168
libcacard/vscclient.c: In function 'do_socket_read':
libcacard/vscclient.c:410: warning: implicit declaration of function 'g_warn_if_reached'
libcacard/vscclient.c:410: warning: nested extern declaration of 'g_warn_if_reached'
libcacard/vscclient.c: In function 'main':
libcacard/vscclient.c:763: warning: implicit declaration of function 'g_byte_array_unref'
libcacard/vscclient.c:763: warning: nested extern declaration of 'g_byte_array_unref'
...
libcacard/vscclient.o: In function `do_socket_read':
libcacard/vscclient.c:410: undefined reference to `g_warn_if_reached'
libcacard/vscclient.o: In function `main':
libcacard/vscclient.c:763: undefined reference to `g_byte_array_unref'
g_warn_if_reached was added in glib 2.16, and g_byte_array_unref is
supported since glib 2.22. QEMU requires glib 2.12, so both names must
not be used.
Instead of showing a warning for code which should not be reached,
vscclient better stop running, so g_warn_if_reached is not useful for
vscclient.
In libcacard/vsclient.c, g_byte_array_unref can be replaced by
g_byte_array_free. This is not generally true, so adding a compatibility
layer in include/glib-compat.h is no option here.
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Reported-by: Don Slutz <dslutz@verizon.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
libcacard/vscclient.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 84f2a81f45667928939bf5afa9731ca0374c410b
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Nov 17 22:12:18 2013 +0100
libcacard/vcard_emul_nss: Remove unused statement (value stored is never read)
Warning from ccc-analyzer:
libcacard/vcard_emul_nss.c:937:9: warning:
Value stored to 'cert_count' is never read
cert_count = options->vreader[i].cert_count;
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c | 1 -
1 file changed, 1 deletion(-)
commit 86af5c1a5eee06f7248b5627a4d77dfdd75889f0
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Nov 17 22:11:23 2013 +0100
libcacard/cac: Remove unused statement (value stored is never read)
Warning from ccc-analyzer:
libcacard/cac.c:192:13: warning: Value stored to 'ret' is never read
ret = VCARD_DONE;
^ ~~~~~~~~~~
Here 'ret' is assigned a value inside of a switch statement and also after
that switch statement.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/cac.c | 1 -
1 file changed, 1 deletion(-)
commit 4507fb611d2fc35eb3d9c51048bfd6eda62d0c6a
Merge: 99a1df8 6613d09
Author: Anthony Liguori <anthony@codemonkey.ws>
Date: Mon Sep 23 11:53:05 2013 -0500
Merge remote-tracking branch 'stefanha/block' into staging
# By Stefan Hajnoczi (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
virtio-blk: do not relay a previous driver's WCE configuration to the current
blockdev: do not default cache.no-flush to true
block: don't lose data from last incomplete sector
qcow2: Correct snapshots size for overlap check
coroutine: fix /perf/nesting coroutine benchmark
coroutine: add qemu_coroutine_yield benchmark
qemu-timer: do not take the lock in timer_pending
qemu-timer: make qemu_timer_mod_ns() and qemu_timer_del() thread-safe
qemu-timer: drop outdated signal safety comments
osdep: warn if open(O_DIRECT) on fails with EINVAL
libcacard: link against qemu-error.o for error_report()
Message-id: 1379698931-946-1-git-send-email-stefanha@redhat.com
commit 99a1df8751b123906862ce4d84487e8e46938a9a
Author: Michael Tokarev <mjt@tls.msk.ru>
Date: Sat Sep 14 13:10:16 2013 +0400
vscclient: remove unnecessary use of uninitialized variable
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vscclient.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 6613d09116b7027360918dea4f0e75486cc82903
Author: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu Aug 22 11:29:02 2013 +0200
libcacard: link against qemu-error.o for error_report()
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
libcacard/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit b21f0a09ea9e6758a28fd52f879eed8d9571cdd4
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Aug 18 19:40:06 2013 +0200
misc: Fix some typos in names and comments
Most typos were found using a modified version of codespell:
accross -> across
issueing -> issuing
TICNT_THRESHHOLD -> TICNT_THRESHOLD
bandwith -> bandwidth
VCARD_7816_PROPIETARY -> VCARD_7816_PROPRIETARY
occured -> occurred
gaurantee -> guarantee
sofware -> software
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/card_7816.c | 2 +-
libcacard/card_7816t.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 74f822deabecb68e696540c0b57394f063ae256b
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Jun 16 11:08:52 2013 +0200
libcacard: Fix cppcheck warning and remove unneeded code
The local function vcard_emul_alloc_arrays always returned PR_TRUE.
Therefore cppcheck complained about code which handled the
non-existent PR_FALSE case.
Remove the function's return value and the dead code.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
commit 09bc678344be396860eb121365a3d562cb33c78d
Author: Alon Levy <alevy@redhat.com>
Date: Tue Jun 4 16:23:37 2013 -0400
libcacard/vscclient: fix leakage of socket on error paths
Spotted by Coverity.
Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vscclient.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 3fd8267558e1572dc707353e476f3afc967a9ca3
Author: Alon Levy <alevy@redhat.com>
Date: Mon Mar 4 21:43:36 2013 +0200
libcacard/cac: change big switch functions to single return point
Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
libcacard/cac.c | 73 ++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 52 insertions(+), 21 deletions(-)
commit 1a1df2bd5fbd45fdda2bbc9c63685288dec17a91
Author: Alon Levy <alevy@redhat.com>
Date: Tue Mar 5 16:27:43 2013 +0200
libcacard: move atr setting from macro to function
Only because qemu's checkpatch complains about it.
Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
libcacard/vcard_emul_nss.c | 14 +++++++++++---
libcacard/vcardt.c | 40 ++++++++++++++++++++++++++++++++++++++++
libcacard/vcardt.h | 13 -------------
libcacard/vcardt_internal.h | 6 ++++++
4 files changed, 57 insertions(+), 16 deletions(-)
commit 983bbd0bda8bb9c0392b668b3edeac1530c3c559
Author: Alon Levy <alevy@redhat.com>
Date: Tue Mar 5 15:32:19 2013 +0200
libcacard/vreader: add debugging messages for apdu
Using g_debug with log domain libcacard
Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
libcacard/cac.c | 7 -----
libcacard/cac.h | 8 ++++++
libcacard/vreader.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 7 deletions(-)
commit 3c8ed11f9beed751df116a1015acd98a78b09aac
Author: Alon Levy <alevy@redhat.com>
Date: Tue Mar 5 15:35:24 2013 +0200
libcacard: change default ATR
Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
libcacard/vcardt.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
commit 8f159d0833a37cbe09376dd2f398c6595ad02dc9
Author: Marc-André Lureau <mlureau@redhat.com>
Date: Wed Mar 20 14:07:49 2013 +0100
libcacard: remove default libcoolkey loading
Use only the modules defined in the NSS database.
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
commit 38639522167c22a05c7e04bc109b536d5462694e
Author: Marc-André Lureau <mlureau@redhat.com>
Date: Wed Mar 20 14:07:48 2013 +0100
libcacard: remove sql: prefix
For some reason, with sql:/ prefix, the PKCS11 modules are not loaded.
This patch goes on top of Alon smartcard series.
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit d099310c3956ee49daaf65b4ce370c84359c0fcf
Author: Marc-André Lureau <mlureau@redhat.com>
Date: Mon Feb 25 23:31:16 2013 +0100
libcacard: teach vscclient to use GMainLoop for portability
This version handles non-blocking sending and receiving from the
socket.
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vscclient.c | 391 +++++++++++++++++++++++++++++++-------------------
1 file changed, 246 insertions(+), 145 deletions(-)
commit 53587fded844e5775c6121bd6faf63ad7d0a36f2
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Feb 25 23:31:15 2013 +0100
libcacard: vscclient to use QemuThread for portability
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vscclient.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
commit fb788bd68eb1b9166f6a7cd3801224e97250cd92
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon Feb 25 23:31:14 2013 +0100
libcacard: split vscclient main() from socket reading
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vscclient.c | 314 ++++++++++++++++++++++++++------------------------
1 file changed, 162 insertions(+), 152 deletions(-)
commit 4dcd211208d7185d77331031c50870418a0940d9
Author: Marc-André Lureau <mlureau@redhat.com>
Date: Wed Feb 27 21:08:06 2013 +0100
libcacard: use system config directory for nss db on win32
It's a bit nicer to look for default database under
CSIDL_COMMON_APPDATA\pki\nss rather that /etc/pki/nss.
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
commit 16f28cb6a2c9d01187931980adca54d2cba990fe
Author: Marc-André Lureau <mlureau@redhat.com>
Date: Sun Dec 2 22:00:55 2012 +0100
libcacard: correct T0 historical bytes size
The VCARD_ATR_PREFIX macro adds a prefix of 6 characters only.
pcsc_scan was complaining before the patch:
+ Historical bytes: 56 43 41 52 44 5F 4E 53 53
ERROR! ATR is truncated: 2 byte(s) is/are missing
Signed-off-by: Marc-André Lureau <mlureau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcardt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7d5d3fc97b714fda943b776abbb5217afcb51934
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon Mar 25 10:23:56 2013 -0500
glib: add a compatibility interface for g_timeout_add_seconds
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
include/glib-compat.h | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit 6ec25c35f1299fb871e3aac25c187a4dc288aabf
Author: Markus Armbruster <armbru@redhat.com>
Date: Tue Jan 22 11:08:04 2013 +0100
libcacard: Fix unchecked strdup() by converting to g_strdup()
Note that we already free with g_free().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
libcacard/vcard_emul_nss.c | 4 ++--
libcacard/vreader.c | 2 +-
libcacard/vscclient.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
commit b49ffdffca29d1ba983ec49d18c60a4fd13d3d30
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri Dec 21 09:45:20 2012 +0100
build: fold trace-obj-y into libqemuutil.a
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 214039846913f2c91470c09464877b6d3c4e2875
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 15:58:44 2012 +0100
build: move libqemuutil.a components to util/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit ab016400744a21df5b05914d572e604e9e7af8dc
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 18:24:27 2012 +0100
libcacard: list oslib-obj-y file explicitly
We will grow the list of files in the next patches, but libcacard
should remain slim.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 206861aff0eba7fb68edfd822e1b1cbcd9d06bd2
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri Dec 21 08:42:03 2012 +0100
libcacard: link vscclient to dynamic library
There is no reason for vscclient to duplicate the code. rules.mak
takes care of invoking libtool to do the link.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit e4fdd0a5f39a20eafa62051a264e7b6afadfb132
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri Dec 21 08:34:49 2012 +0100
libcacard: rewrite Makefile in non-recursive style
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
commit c7669d3fd8de1601b5d5e63f605c76b1b6e8f2c8
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 18:19:51 2012 +0100
libcacard: add list of exported symbols
Do not export internal QEMU symbols.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 3 +-
libcacard/libcacard.syms | 77 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 1 deletion(-)
commit ec190c04ea8e512338420f67e9127790f75bc631
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri Dec 21 09:13:10 2012 +0100
libcacard: use per-target variable definitions
This lets the libcacard Makefile use more rules.mak magic.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 95b203677dd7c42a5ed84ed87aea135b97ec46b0
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri Dec 21 09:16:33 2012 +0100
libcacard: prepare to use -y trick in the Makefile
Rename variables to follow the conventions of the rest of the build
systems.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
commit bfe0b496071d2993cf7e8462fcc00e6902077747
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 20:40:35 2012 +0100
libcacard: require libtool to build it
Do not fail at build time, instead just disable the library if libtool
is not present.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 8 --------
1 file changed, 8 deletions(-)
commit e6031597ddc62481ce1fcc8979d392adb8b7a5ba
Author: Alon Levy <alevy@redhat.com>
Date: Wed Nov 28 11:16:26 2012 +0200
libcacard: fix missing symbol in libcacard.so
Before patch:
$ make libcacard.la
$ nm ./libcacard/.libs/libcacard.so.0.0.0 | grep " U " | \
egrep -v "(g_)|(GLIBC)|(SECMOD)|(PK11)|(CERT)|(NSS)|(PORT)|(PR)"
U error_set
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5506f60b11a54d457599a1757c88f563f2582b8b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 18:57:45 2012 +0100
build: support linking with libtool objects/libraries
This patch moves the complication of using libtool to the generic
rules.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit 967f6adcec35c96a089ce23878031e6161d9ac02
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu Dec 20 18:32:53 2012 +0100
build: make libtool verbose when making with V=1
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5079744ef99014d166c40dbdd7d3dae7a4279fc4
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon Dec 17 18:20:00 2012 +0100
misc: move include files to include/qemu/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/event.c | 2 +-
libcacard/vreader.c | 2 +-
libcacard/vscclient.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
commit 2f9ad1a12dbd9baf327ae0e7bc47a61cf4132368
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon Nov 19 09:45:20 2012 +0100
libcacard: link in stubs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 85ebd70aaae7967e92f737847ef09bdf176d11ef
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon Nov 19 09:45:06 2012 +0100
libcacard: make unnesting rules available to Makefile.objs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 00385729546c89d9e16d6c8c7b4643d644c7fb87
Merge: 521ed4f ab604dd
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Oct 6 18:54:14 2012 +0200
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
versatilepb: Use symbolic indices for ARM PIC
qdev: kill bogus comment
qemu-barrier: Fix compiler version check for future gcc versions
hw: Add missing 'static' attribute for QEMUMachine
cleanup useless return sentence
qemu-sockets: Fix compiler warning (regression for MinGW)
vnc: Fix spelling (hellmen -> hellman) in comment
slirp: Fix spelling in comment (enought -> enough, insure -> ensure)
tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code
cpu: Add missing 'static' attribute to qemu_global_mutex
configure: Support empty target list (--target-list=)
hw: Fix return value check for bdrv_read, bdrv_write
commit ab604dda51766c40362563a41905c3b3f75abbc4
Author: Amos Kong <akong@redhat.com>
Date: Sat Sep 29 13:36:21 2012 +0800
cleanup useless return sentence
This patch cleans up return sentences in the end of void functions.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
libcacard/vcard.c | 1 -
libcacard/vcard_emul_nss.c | 3 ---
libcacard/vreader.c | 1 -
3 files changed, 5 deletions(-)
commit 521ed4f3afe8909c87a58cf0b09061f9fc91cd12
Author: Jim Meyering <meyering@redhat.com>
Date: Thu Oct 4 13:09:59 2012 +0200
libcacard/vcard_emul_nss: use pstrcpy in place of strncpy
Replace strncpy+NUL-terminate use with use of pstrcpy.
This requires linking with cutils.o (or else vssclient doesn't link),
so add that in the Makefile.
Acked-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/Makefile | 3 +++
libcacard/vcard_emul_nss.c | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
commit 99f16ae1ee3f112968af0588bfc98c8724b61b76
Author: Blue Swirl <blauwirbel@gmail.com>
Date: Sun Jun 10 10:18:54 2012 +0000
libcacard: build fixes
Link trace objects to fix these errors:
LINK vscclient
oslib-posix.o: In function `trace_qemu_vfree':
/src/qemu/obj-amd64/./trace.h:39: undefined reference to `trace1'
oslib-posix.o: In function `trace_qemu_memalign':
/src/qemu/obj-amd64/./trace.h:31: undefined reference to `trace3'
oslib-posix.o: In function `trace_qemu_vmalloc':
/src/qemu/obj-amd64/./trace.h:35: undefined reference to `trace2'
Add LDFLAGS to vscclient link command.
Clean up also in subdirectories of libcacard.
Use quiet-command for sed invocation.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alon Levy <alevy@redhat.com>
libcacard/Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit 41b2c7a8094c84c8f04790d705bab101bbbd6849
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue May 29 11:40:24 2012 +0200
build: libcacard Makefile cleanups
Build vscclient from toplevel Makefile, limit usage of vpath.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
libcacard/Makefile | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
commit 66825ebf02f1a0df036d048f744d9a9aa032f69a
Author: Alon Levy <alevy@redhat.com>
Date: Thu Mar 22 20:00:36 2012 +0200
libcacard/vcard_emul_nss: add warning for old coolkey
Older coolkey versions (before the future fix of RHBZ 802435) have
a fake card reader created if no reader is detected during module
initialization. Warn libcacard users if the faulty coolkey is detected
by checking for the fake reader name "E-Gate 0 0".
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 98045c93271f6a1e99b89f4233b55d0419e18916
Author: Alon Levy <alevy@redhat.com>
Date: Thu Mar 22 19:58:58 2012 +0200
libcacard/vcard_emul_nss: handle no readers at startup
When starting with no readers, coolkey should show no slots (with
RHBZ 806038 fixed). Fix initialization to launch the event handling
thread for each module that isn't the internal module regardless of the
number of slots detected for it at initialization time, since slot
number may start as 0 and is dynamic.
RHBZ: 802435
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
commit eb8dd0ca82cf0bdeae343bb135fbd7fc09ed9561
Author: Alon Levy <alevy@redhat.com>
Date: Thu Mar 22 19:44:49 2012 +0200
libcacard/vcard_emul_nss: don't stop thread when there are no slots
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 16673a09500121825826a8b97dc1f0ce53e7c6f5
Merge: 1e8aa10 6c1302d
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri Mar 9 12:30:20 2012 -0600
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: Quote the configure args printed in config.log
osdep: Remove local definition of macro offsetof
libcacard: Spelling and grammar fixes in documentation
Spelling fixes in comments (it's -> its)
vnc: Add break statement
libcacard: Use format specifier %u instead of %d for unsigned values
Fix sign of sscanf format specifiers
block/vmdk: Fix warning from splint (comparision of unsigned value)
qmp: Fix spelling fourty -> forty
qom: Fix spelling in documentation
sh7750: Remove redundant 'struct' from MemoryRegionOps
commit 1e8aa1086b23980c975d56d4f3eeaa7af5d7d8f2
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Mar 2 16:49:44 2012 +0100
libcacard: Fix compilation with gcc-4.7
VCARD_ATR_PREFIX is used as part of an array initializer so it should
not have () around it, so far this happened to work, but gcc-4.7 does
not like it.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/vcardt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6c1302da2bce81dc9c34a0d89d78d82fb02eb454
Author: Stefan Weil <sw@weilnetz.de>
Date: Mon Feb 27 22:57:24 2012 +0100
libcacard: Spelling and grammar fixes in documentation
* it's -> its
* it's -> it is (that's no fix, but makes future checks easier)
* this functions -> this function
* replacable -> replaceable
* reader's -> readers
* logins into -> logs into
v2:
Also replace 'aid' by 'AID' (thanks to Peter Maydell for this hint).
v3:
Fix sentence (contributed by Alon Levy / Robert Relyea).
Cc: Alon Levy <alevy@redhat.com>
Cc: Robert Relyea <rrelyea@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
docs/libcacard.txt | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
commit e5488aebbd3fd2a401f3748e72f941f27abc89c1
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Feb 26 18:46:12 2012 +0100
Spelling fixes in comments (it's -> its)
* it's -> its (fixed for all files)
* dont -> don't (only fixed in a line which was touched by the previous fix)
* distrub -> disturb (fixed in the same line)
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/vscclient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 298bf38b527d4bfef3edcecf4a0ad899cb8bb71e
Author: Stefan Weil <sw@weilnetz.de>
Date: Sat Feb 25 14:54:17 2012 +0100
libcacard: Use format specifier %u instead of %d for unsigned values
splint reported warnings for those code statements.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/vscclient.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit f58bd27cbd00d44f9f27f6dd80c32e50d97844ac
Author: Alon Levy <alevy@redhat.com>
Date: Sun Feb 26 17:09:24 2012 +0100
libcacard: fix reported ATR length
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
libcacard/vcardt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ecc2eab2130496ec362fec08cf5a7e78fac00e2d
Merge: d8b06be a5732cb
Author: Kevin Wolf <kwolf@redhat.com>
Date: Thu Feb 23 10:33:55 2012 +0100
Merge qemu-iotests into for-anthony
commit a5732cb53814f6ed397f24c984fb6ecb2356e3ef
Author: Christoph Hellwig <hch@brick.lst.de>
Date: Mon Jun 22 18:29:05 2009 +0200
qemu-iotests: Initial import into the public repository.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
commit d8b06be29ff320c190bc9950aa48c117fd95ac7c
Author: Stefan Weil <sw@weilnetz.de>
Date: Wed Feb 8 22:41:37 2012 +0100
make: Remove duplicate use of GLIB_CFLAGS
Makefile, Makefile.hw, Makefile.target and libcacard/Makefile
added GLIB_CFLAGS to QEMU_CFLAGS.
Makefile.objs does this, too, and is included by all other
Makefiles, so GLIB_CFLAGS were added twice (reported by malc).
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: malc <av1474@comtv.ru>
libcacard/Makefile | 2 --
1 file changed, 2 deletions(-)
commit c91222af158bdb77ac23e488304fb5db0b2a400a
Author: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Date: Tue Nov 22 18:06:18 2011 +0800
fix spelling in libcacard sub directory
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/card_7816.c | 4 ++--
libcacard/card_7816.h | 2 +-
libcacard/vcard_emul_nss.c | 2 +-
libcacard/vscard_common.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
commit 6ccd1e53652b64df04434201e7d465811b3b8961
Author: Matthias Brugger <matthias.bgg@gmail.com>
Date: Tue Nov 15 11:57:14 2011 +0000
Fixing some spelling in docs/libcacard.txt
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
docs/libcacard.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit e8c4ad12d94f737c83b7d7d668c9f452c729af3b
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Nov 13 22:24:27 2011 +0100
Fix some spelling bugs in documentation and comments
These errors were detected by codespell:
remaing -> remaining
soley -> solely
virutal -> virtual
seperate -> separate
libcacard.txt still needs some more patches.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
docs/libcacard.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 80ac0350eb9a3d6f12a8a1bb158e7ec3ff44ada4
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Nov 13 22:24:26 2011 +0100
Fix spelling in documentation and comments (similiar -> similar)
This bug was detected by codespell.
In mips_mipssim.c a grammatical error was fixed, too.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
docs/libcacard.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9dcc36b5e30994a21ba27690efb16cd6bc3fc1af
Author: Stefan Weil <sw@weilnetz.de>
Date: Wed Oct 19 21:03:22 2011 +0200
libcacard: Fix wrong assertion (reported by cppcheck)
assert("...") will never do anything. This assertion handles a case
which should never occur, so it must be assert(!"...").
Cc: Alon Levy <alevy@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
libcacard/card_7816.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e556cf132e2838fe3dcb958e7fa1b6442cc9f6e2
Author: Alon Levy <alevy@redhat.com>
Date: Tue Sep 27 17:19:25 2011 +0300
libcacard/vscclient: fix error paths for socket creation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/vscclient.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 7c126739b34a03ab046caaf0b22bb37b611b21c6
Author: Alon Levy <alevy@redhat.com>
Date: Tue Sep 27 17:18:50 2011 +0300
libcacard/cac: fix typo in cac_delete_pki_applet_private
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/cac.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit aaea98e6ff86880300718cd4359c055ad53930cd
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed Sep 21 09:18:32 2011 +0200
Silence make if nothing is to do for libcacard
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/Makefile | 2 ++
1 file changed, 2 insertions(+)
commit 41993eda21d6a3631982d92bcc91324e096474e5
Author: Brad Smith <brad@comstyle.com>
Date: Fri Sep 2 10:53:26 2011 +0100
libcacard: use INSTALL_DATA for data
Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ae37e1a7fd3c6d3fa986d5fc8f5466583d3661e7
Author: Stefan Weil <weil@mail.berlios.de>
Date: Sun Aug 28 21:45:40 2011 +0200
Fix spelling in comments and debug messages (recieve -> receive)
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Reviewed-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/vscclient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 287cc743d99eb845f5d2135f72a94767bd5f7981
Author: Brad <brad@comstyle.com>
Date: Mon Aug 22 16:39:59 2011 -0400
Fix build on OpenBSD with BSD userland emu and smartcard NSS enabled
The first issue is the hard coded POSIX Real Time extensions library in the
libcacard/Makefile. From looking at the code it doesn't seem this is necessary
anyway. Robert Relyea seems to think it most likely isn't necessary.
The second issue was the missing exclusion of the BSD userland binary
builds from the addition of this Makefile target for the smartcard NSS
code which breaks the builds if smartcard NSS support is enabled.
pastebin clip of the build failure..
http://pastebin.com/raw.php?i=BLCKd3s6
Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
libcacard/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit eb222958ce988f9d38e329e1ba5d34eda466fb7f
Author: Brad <brad@comstyle.com>
Date: Sat Aug 13 20:30:14 2011 -0400
Improvements to libtool support.
Improvements to the libtool support in QEMU. Replace hard coded
libtool in the infrastructure with $(LIBTOOL) and allow
overriding the libtool binary used via the configure
script.
Reviewed-by: Andreas F=E4rber <andreas.faerber@web.de>
Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 13a5471ccc3495e7900cda0d4fad831f29d29f30
Author: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Date: Sun Aug 14 15:31:24 2011 +0200
build: list libraries after objects, for proper linkage
Without this change, when using -Wl,--as-needed with GNU linker, the
libraries would be discarded.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ec49acd2f4c2c35958d38bbe7840f0b1b54137c1
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Sun Aug 21 08:36:21 2011 -0500
Remove remenants of qemu_malloc
This covers the various check commands
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5efbf562205ceee0ffe2d39c6cda1683e6342f83
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Sat Aug 20 22:09:37 2011 -0500
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/cac.c | 16 ++++++++--------
libcacard/card_7816.c | 28 +++++++++++++--------------
libcacard/event.c | 4 ++--
libcacard/vcard.c | 20 +++++++++----------
libcacard/vcard_emul_nss.c | 48 +++++++++++++++++++++++-----------------------
libcacard/vreader.c | 14 +++++++-------
libcacard/vscclient.c | 2 +-
7 files changed, 66 insertions(+), 66 deletions(-)
commit 29fb96a4c6bc49e6dba8d0353bd1aafad2a0c2ec
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Sat Aug 20 22:18:37 2011 -0500
Make glib mandatory and fixup utils appropriately
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
libcacard/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit a53d1ae4d58d81e91045084206e49c6d2cbd76e5
Author: Alon Levy <alevy@redhat.com>
Date: Thu Jul 28 12:34:13 2011 +0300
libcacard: use INSTALL_DATA for data
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
commit a70b08e8aeb5a341e48f81ca73cb818716e1268a
Author: Alon Levy <alevy@redhat.com>
Date: Mon Jun 27 11:58:20 2011 +0200
libcacard: add pc file, install it + includes
Additionally:
+ add --includedir configure parameters
+ make install-libcacard install vscclient as well
libcacard/Makefile | 27 ++++++++++++++++++++++++---
libcacard/libcacard.pc.in | 13 +++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
commit 57c5b6145c7290ba3a29cb9534a393ace3c683b7
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Jul 22 13:42:20 2011 +0200
libcacard: replace copy_string with strndup
copy_string reimplements strndup, this commit removes it and
replaces all copy_string uses with strndup.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
commit 1ae3ef3c88fe2e7beeb5dce4cd3e89bdd0d51acd
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Jul 22 13:42:19 2011 +0200
libcacard: introduce NEXT_TOKEN macro
vcard_emul_options now has repetitive code to read the current
token and advance to the next. After the previous changes,
this repetitive code can be moved in a NEXT_TOKEN macro to
avoid having this code duplicated.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 71 ++++++++++++++++------------------------------
1 file changed, 24 insertions(+), 47 deletions(-)
commit c3c3609a0f444b76590d5af0bc2f1a432e8a5a4b
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Jul 22 13:42:18 2011 +0200
libcacard: fix soft=... parsing in vcard_emul_options
The previous parser had copy and paste errors when computing
vname_length and type_params_length, "name" was used instead
of respectively vname and type_params. This led to length that could
be bigger than the input string, and to access out of the array
bounds when trying to copy these strings. valgrind rightfully
complained about this. It also didn't handle empty fields correctly,
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
commit c034dda00c7ea0e0ae0a4cc2a9d2f22ed81f412f
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri Jul 22 13:42:17 2011 +0200
libcacard: s/strip(args++)/strip(args+1)
vcard_emul_options used args = strip(args++) a few times, which
was not returning the expected result since the rest of the code
expected args to be increased by at least 1, which is not the case
if *args is not a blank space when this function is called.
Replace these calls by "strip(args+1)" which will do what we expect.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
libcacard/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5335a2491a4b1695954c8e70985e8c92bd9ba9c4
Author: Christophe Fergeau <cfergeau@redhat.com>
Date: Mon Jul 4 18:10:43 2011 +0200
libcacard: don't leak vcard_emul_alloc_arrays mem
vcard_emul_mirror_card and vcard_emul_init use
vcard_emul_alloc_arrays to allocate memory for temporary arrays
which will contain elements that in the end will be used one by
one in cac_card_init. The arrays themselves are never stored
anywhere, they are only used as temporary containers. Hence
the memory that was allocated for these arrays should be freed
after use or they will be leaked.
libcacard/vcard_emul_nss.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 9b9dc7cfbd717c875131643a26bb912b6a7c91aa
Author: Robert Relyea <rrelyea@redhat.com>
Date: Tue Jun 28 17:28:22 2011 +0200
libcacard/vcard_emul_nss: support cards lying about CKM_RSA_X_509 support
Some tokens claim to do CKM_RSA_X_509, but then choke when they try to do the
actual operations. Try to detect those cases and treat them as if the token
didn't claim support for X_509.
Signed-off-by: Robert Relyea <rrelyea@redhat.com>
libcacard/vcard_emul_nss.c | 133 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 127 insertions(+), 6 deletions(-)
commit f1f96f2572a1b573ce1c6aad32c630426abf99d3
Merge: f02c0d6 4a78766
Author: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed Jun 15 09:03:49 2011 -0500
Merge remote-tracking branch 'alon/pull-libcacard-1' into staging
commit f02c0d634cd65f972540403ff4b50618b7f730ba
Author: Alon Levy <alevy@redhat.com>
Date: Sun May 15 11:51:28 2011 +0300
libcacard: add libcacard.la target
No flag to configure is required. Instead, added a libcacard.la target that
is not built by default, only when requested explicitly via:
mkdir build
cd build
../configure
make libcacard.la
make install-libcacard
Uses libtool to do actual linking of object files and shared library, and
installing. Tested only under linux, but supposed to work on other systems as
well.
If libtool isn't found you get a message complaining about that, only at build
time (since it is not a default target I did not add a message at configure
time).
New build artifacts:
.libs subdirectories (at <buildroot> and <buildroot>/libcacard)
*.lo files (at same locations as the respective o files)
Added %.lo : %.c rule that uses libtool.
Updated clean rule to clean up those artifacts.
Added specific rule to call dtrace with libtool wrapper (note that because of
a current upstream dtrace bug fixed by systemtap b1568fd85 commit the -fPIC flag
isn't actually passed on. still current dtrace+libtool produced object links fine).
If libtool is missing any of the following targets will complain and exit 1:
any subdir: *.lo
root and libcacard: libcacard.la, libcacard-instsall
Tested to link and load with all tracing backends.
libcacard/Makefile | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
commit 4a78766f4b6a3882d124033ab99a1e6c58c56d7b
Author: Alon Levy <alevy@redhat.com>
Date: Sun May 15 11:51:28 2011 +0300
libcacard: add libcacard.la target
No flag to configure is required. Instead, added a libcacard.la target that
is not built by default, only when requested explicitly via:
mkdir build
cd build
../configure
make libcacard.la
make install-libcacard
Uses libtool to do actual linking of object files and shared library, and
installing. Tested only under linux, but supposed to work on other systems as
well.
If libtool isn't found you get a message complaining about that, only at build
time (since it is not a default target I did not add a message at configure
time).
New build artifacts:
.libs subdirectories (at <buildroot> and <buildroot>/libcacard)
*.lo files (at same locations as the respective o files)
Added %.lo : %.c rule that uses libtool.
Updated clean rule to clean up those artifacts.
Added specific rule to call dtrace with libtool wrapper (note that because of
a current upstream dtrace bug fixed by systemtap b1568fd85 commit the -fPIC flag
isn't actually passed on. still current dtrace+libtool produced object links fine).
If libtool is missing any of the following targets will complain and exit 1:
any subdir: *.lo
root and libcacard: libcacard.la, libcacard-instsall
Tested to link and load with all tracing backends.
libcacard/Makefile | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
commit 0865a0af53e951941f834e63bf6bf69bfbe07b5e
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon May 2 09:54:03 2011 +0200
libcacard: add correct subdirectory dependencies
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/Makefile | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
commit 198b9d1cb9826172d73d2a90ebb677beeef6f06e
Author: Stefan Weil <weil@mail.berlios.de>
Date: Thu Apr 28 17:20:34 2011 +0200
Fix typos in comments (existance -> existence)
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/vscard_common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1b3f75ca17e143335fff0f13afe82c7421214479
Author: Stefan Weil <weil@mail.berlios.de>
Date: Thu Apr 28 17:20:31 2011 +0200
Fix typo in comment (consistant -> consistent)
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
libcacard/vcard_emul_nss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6b0211e584b32e9224a2378c231c1c63a3264c49
Author: Alon Levy <alevy@redhat.com>
Date: Wed Apr 13 14:42:00 2011 +0300
libcacard: fix opposite usage of isspace
Signed-off-by: Alon Levy <alevy@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
libcacard/vcard_emul_nss.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 0e30993747a3f26b12db43913ec881b847421cdd
Author: Robert Relyea <rrelyea@redhat.com>
Date: Thu Mar 17 16:39:46 2011 +0200
libcacard: add docs
docs/libcacard.txt | 483 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 483 insertions(+)
commit 15231cd82f6bc266538410bbed09b614ea9489a2
Author: Robert Relyea <rrelyea@redhat.com>
Date: Thu Mar 17 16:38:30 2011 +0200
libcacard: add vscclient
client to talk to ccid-card-passthru and use smartcard on client to
perform actual operations.
v23->v24 changes: (Jes Sorensen review 2)
* use qemu_socket instead of socket
* use fprintf(stderr,..) for errors
* remove unneccessary includes since using qemu_common.h
libcacard/Makefile | 7 +-
libcacard/vscclient.c | 652 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 658 insertions(+), 1 deletion(-)
commit 3b7042ff8124ae411825b5bbb549ec0d58aa2dea
Author: Robert Relyea <rrelyea@redhat.com>
Date: Sun Nov 28 16:36:38 2010 +0200
libcacard: initial commit
libcacard emulates a Common Access Card (CAC) which is a standard
for smartcards. It is used by the emulated ccid card introduced in
a following patch. Docs are available in docs/libcacard.txt
Signed-off-by: Alon Levy <alevy@redhat.com>
---
changes from v24->v25:
* Fix out of tree builds.
* Fix build with linux-user targets.
changes from v23->v24: (Jes Sorensen review 2)
* Makefile.target: use obj-$(CONFIG_*) +=
* remove unrequired includes, include qemu-common before qemu-thread
* required adding #define NO_NSPR_10_SUPPORT (harmless)
changes from v22->v23:
* configure fixes: (reported by Stefan Hajnoczi)
* test a = b, not a == b (second isn't portable)
* quote $source_path in case it contains spaces
- this doesn't really help since there are many other places
that need similar fixes, not introduced by this patch.
changes from v21->v22:
* fix configure to not link libcacard if nss not found
(reported by Stefan Hajnoczi)
* fix vscclient linkage with simpletrace backend
(reported by Stefan Hajnoczi)
* card_7816.c: add missing break in ERROR_DATA_NOT_FOUND
(reported by William van de Velde)
changes from v20->v21: (Jes Sorensen review)
* use qemu infrastructure: qemu-thread, qemu-common (qemu_malloc
and qemu_free), error_report
* assert instead of ASSERT
* cosmetic fixes
* use strpbrk and isspace
* add --disable-nss --enable-nss here, instead of in the final patch.
* split vscclient, passthru and docs to following patches.
changes from v19->v20:
* checkpatch.pl
changes from v15->v16:
Build:
* don't erase self with distclean
* fix make clean after make distclean
* Makefile: make vscclient link quiet
Behavioral:
* vcard_emul_nss: load coolkey in more situations
* vscclient:
* use hton,ntoh
* send init on connect, only start vevent thread on response
* read payload after header check, before type switch
* remove Reconnect
* update for vscard_common changes, empty Flush implementation
Style/Whitespace:
* fix wrong variable usage
* remove unused variable
* use only C style comments
* add copyright header
* fix tabulation
Signed-off-by: Alon Levy <alevy@redhat.com>
libcacard: fix out of tree builds
libcacard/Makefile | 20 +
libcacard/cac.c | 403 +++++++++++++++
libcacard/cac.h | 23 +
libcacard/card_7816.c | 763 ++++++++++++++++++++++++++++
libcacard/card_7816.h | 62 +++
libcacard/card_7816t.h | 165 ++++++
libcacard/event.c | 106 ++++
libcacard/eventt.h | 29 ++
libcacard/link_test.c | 22 +
libcacard/vcard.c | 339 +++++++++++++
libcacard/vcard.h | 86 ++++
libcacard/vcard_emul.h | 65 +++
libcacard/vcard_emul_nss.c | 1157 +++++++++++++++++++++++++++++++++++++++++++
libcacard/vcard_emul_type.c | 57 +++
libcacard/vcard_emul_type.h | 32 ++
libcacard/vcardt.h | 64 +++
libcacard/vevent.h | 27 +
libcacard/vreader.c | 513 +++++++++++++++++++
libcacard/vreader.h | 55 ++
libcacard/vreadert.h | 24 +
20 files changed, 4012 insertions(+)
commit 4ff8618988f67ef0315b22ba0d405d98e14eca70
Author: Alon Levy <alevy@redhat.com>
Date: Wed Feb 2 21:48:04 2011 +0200
introduce libcacard/vscard_common.h
---
Signed-off-by: Alon Levy <alevy@redhat.com>
v20->v21 changes: (Jes Sorensen review)
* license set to 2+
* long comment fixes, remove empty line at eof.
* add reference to COPYING
v19->v20 changes:
* checkpatch.pl
v15->v16 changes:
Protocol change:
* VSCMsgInit capabilities and magic
* removed ReaderResponse, will use Error instead with code==VSC_SUCCESS.
* adaded Flush and FlushComplete, remove Reconnect.
* define VSCARD_MAGIC
* added error code VSC_SUCCESS.
Fixes:
* update VSCMsgInit comment
* fix message type enum
* remove underscore from wrapping define
* update copyright
* updated comments.
* Header comment updated
* remove C++ style comment
* fix comment for VSCMsgError
* give names to enums in typedefs
libcacard/vscard_common.h | 178 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 178 insertions(+)
commit e63c3dc74bfb90e4522d075d0d5a7600c5145745
Author: (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue Feb 18 22:55:36 2003 +0000
Standard project directories initialized by cvs2svn.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1 c046a42c-6fe2-441c-8c8c-71466251a162
|