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 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 6531 6532 6533 6534 6535 6536 6537 6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 6576 6577 6578 6579 6580 6581 6582 6583 6584 6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 6701 6702 6703 6704 6705 6706 6707 6708 6709 6710 6711 6712 6713 6714 6715 6716 6717 6718 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 6773 6774 6775 6776 6777 6778 6779 6780 6781 6782 6783 6784 6785 6786 6787 6788 6789 6790 6791 6792 6793 6794 6795 6796 6797 6798 6799 6800 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 6822 6823 6824 6825 6826 6827 6828 6829 6830 6831 6832 6833 6834 6835 6836 6837 6838 6839 6840 6841 6842 6843 6844 6845 6846 6847 6848 6849 6850 6851 6852 6853 6854 6855 6856 6857 6858 6859 6860 6861 6862 6863 6864 6865 6866 6867 6868 6869 6870 6871 6872 6873 6874 6875 6876 6877 6878 6879 6880 6881 6882 6883 6884 6885 6886 6887 6888 6889 6890 6891 6892 6893 6894 6895 6896 6897 6898 6899 6900 6901 6902 6903 6904 6905 6906 6907 6908 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 6955 6956 6957 6958 6959 6960 6961 6962 6963 6964 6965 6966 6967 6968 6969 6970 6971 6972 6973 6974 6975 6976 6977 6978 6979 6980 6981 6982 6983 6984 6985 6986 6987 6988 6989 6990 6991 6992 6993 6994 6995 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 7011 7012 7013 7014 7015 7016 7017 7018 7019 7020 7021 7022 7023 7024 7025 7026 7027 7028 7029 7030 7031 7032 7033 7034 7035 7036 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 7057 7058 7059 7060 7061 7062 7063 7064 7065 7066 7067 7068 7069 7070 7071 7072 7073 7074 7075 7076 7077 7078 7079 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 7098 7099 7100 7101 7102 7103 7104 7105 7106 7107 7108 7109 7110 7111 7112 7113 7114 7115 7116 7117 7118 7119 7120 7121 7122 7123 7124 7125 7126 7127 7128 7129 7130 7131 7132 7133 7134 7135 7136 7137 7138 7139 7140 7141 7142 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 7157 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 7207 7208 7209 7210 7211 7212 7213 7214 7215 7216 7217 7218 7219 7220 7221 7222 7223 7224 7225 7226 7227 7228 7229 7230 7231 7232 7233 7234 7235 7236 7237 7238 7239 7240 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 7411 7412 7413 7414 7415 7416 7417 7418 7419 7420 7421 7422 7423 7424 7425 7426 7427 7428 7429 7430 7431 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 7523 7524 7525 7526 7527 7528 7529 7530 7531 7532 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 7624 7625 7626 7627 7628 7629 7630 7631 7632 7633 7634 7635 7636 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 7704 7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 7783 7784 7785 7786 7787 7788 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 7870 7871 7872 7873 7874 7875 7876 7877 7878 7879 7880 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 7945 7946 7947 7948 7949 7950 7951 7952 7953 7954 7955 7956 7957 7958 7959 7960 7961 7962 7963 7964 7965 7966 7967 7968 7969 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 7987 7988 7989 7990 7991 7992 7993 7994 7995 7996 7997 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 8169 8170 8171 8172 8173 8174 8175 8176 8177 8178 8179 8180 8181 8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 8208 8209 8210 8211 8212 8213 8214 8215 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 8239 8240 8241 8242 8243 8244 8245 8246 8247 8248 8249 8250 8251 8252 8253 8254 8255 8256 8257 8258 8259 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 8280 8281 8282 8283 8284 8285 8286 8287 8288 8289 8290 8291 8292 8293 8294 8295 8296 8297 8298 8299 8300 8301 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 8398 8399 8400 8401 8402 8403 8404 8405 8406 8407 8408 8409 8410 8411 8412 8413 8414 8415 8416 8417 8418 8419 8420 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 8478 8479 8480 8481 8482 8483 8484 8485 8486 8487 8488 8489 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 8540 8541 8542 8543 8544 8545 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 8577 8578 8579 8580 8581 8582 8583 8584 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 8611 8612 8613 8614 8615 8616 8617 8618 8619 8620 8621 8622 8623 8624 8625 8626 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669 8670 8671 8672 8673 8674 8675 8676 8677 8678 8679 8680 8681 8682 8683 8684 8685 8686 8687 8688 8689 8690 8691 8692 8693 8694 8695 8696 8697 8698 8699 8700 8701 8702 8703 8704 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 8739 8740 8741 8742 8743 8744 8745 8746 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 8821 8822 8823 8824 8825 8826 8827 8828 8829 8830 8831 8832 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 8860 8861 8862 8863 8864 8865 8866 8867 8868 8869 8870 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 8886 8887 8888 8889 8890 8891 8892 8893 8894 8895 8896 8897 8898 8899 8900 8901 8902 8903 8904 8905 8906 8907 8908 8909 8910 8911 8912 8913 8914 8915 8916 8917 8918 8919 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 9506 9507 9508 9509 9510 9511 9512 9513 9514 9515 9516 9517 9518 9519 9520 9521 9522 9523 9524 9525 9526 9527 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 9543 9544 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 9643 9644 9645 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 9764 9765 9766 9767 9768 9769 9770 9771 9772 9773 9774 9775 9776 9777 9778 9779 9780 9781 9782 9783 9784 9785 9786 9787 9788 9789 9790 9791 9792 9793 9794 9795 9796 9797 9798 9799 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9812 9813 9814 9815 9816 9817 9818 9819 9820 9821 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 9837 9838 9839 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 9863 9864 9865 9866 9867 9868 9869 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 10013 10014 10015 10016 10017 10018 10019 10020 10021 10022 10023 10024 10025 10026 10027 10028 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 10098 10099 10100 10101 10102 10103 10104 10105 10106 10107 10108 10109 10110 10111 10112 10113 10114 10115 10116 10117 10118 10119 10120 10121 10122 10123 10124 10125 10126 10127 10128 10129 10130 10131 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 10288 10289 10290 10291 10292 10293 10294 10295 10296 10297 10298 10299 10300 10301 10302 10303 10304 10305 10306 10307 10308 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 10582 10583 10584 10585 10586 10587 10588 10589 10590 10591 10592 10593 10594 10595 10596 10597 10598 10599 10600 10601 10602 10603 10604 10605 10606 10607 10608 10609 10610 10611 10612 10613 10614 10615 10616 10617 10618 10619 10620 10621 10622 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 10668 10669 10670 10671 10672 10673 10674 10675 10676 10677 10678 10679 10680 10681 10682 10683 10684 10685 10686 10687 10688 10689 10690 10691 10692 10693 10694 10695 10696 10697 10698 10699 10700 10701 10702 10703 10704 10705 10706 10707 10708 10709 10710 10711 10712 10713 10714 10715 10716 10717 10718 10719 10720 10721 10722 10723 10724 10725 10726 10727 10728 10729 10730 10731 10732 10733 10734 10735 10736 10737 10738 10739 10740 10741 10742 10743 10744 10745 10746 10747 10748 10749 10750 10751 10752 10753 10754 10755 10756 10757 10758 10759 10760 10761 10762 10763 10764 10765 10766 10767 10768 10769 10770 10771 10772 10773 10774 10775 10776 10777 10778 10779 10780 10781 10782 10783 10784 10785 10786 10787 10788 10789 10790 10791 10792 10793 10794 10795 10796 10797 10798 10799 10800 10801 10802 10803 10804 10805 10806 10807 10808 10809 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 10845 10846 10847 10848 10849 10850 10851 10852 10853 10854 10855 10856 10857 10858 10859 10860 10861 10862 10863 10864 10865 10866 10867 10868 10869 10870 10871 10872 10873 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 10889 10890 10891 10892 10893 10894 10895 10896 10897 10898 10899 10900 10901 10902 10903 10904 10905 10906 10907 10908 10909 10910 10911 10912 10913 10914 10915 10916 10917 10918 10919 10920 10921 10922 10923 10924 10925 10926 10927 10928 10929 10930 10931 10932 10933 10934 10935 10936 10937 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 10953 10954 10955 10956 10957 10958 10959 10960 10961 10962 10963 10964 10965 10966 10967 10968 10969 10970 10971 10972 10973 10974 10975 10976 10977 10978 10979 10980 10981 10982 10983 10984 10985 10986 10987 10988 10989 10990 10991 10992 10993 10994 10995 10996 10997 10998 10999 11000 11001 11002 11003 11004 11005 11006 11007 11008 11009 11010 11011 11012 11013 11014 11015 11016 11017 11018 11019 11020 11021 11022 11023 11024 11025 11026 11027 11028 11029 11030 11031 11032 11033 11034 11035 11036 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 11060 11061 11062 11063 11064 11065 11066 11067 11068 11069 11070 11071 11072 11073 11074 11075 11076 11077 11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 11102 11103 11104 11105 11106 11107 11108 11109 11110 11111 11112 11113 11114 11115 11116 11117 11118 11119 11120 11121 11122 11123 11124 11125 11126 11127 11128 11129 11130 11131 11132 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 11163 11164 11165 11166 11167 11168 11169 11170 11171 11172 11173 11174 11175 11176 11177 11178 11179 11180 11181 11182 11183 11184 11185 11186 11187 11188 11189 11190 11191 11192 11193 11194 11195 11196 11197 11198 11199 11200 11201 11202 11203 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 11240 11241 11242 11243 11244 11245 11246 11247 11248 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 11293 11294 11295 11296 11297 11298 11299 11300 11301 11302 11303 11304 11305 11306 11307 11308 11309 11310 11311 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 11322 11323 11324 11325 11326 11327 11328 11329 11330 11331 11332 11333 11334 11335 11336 11337 11338 11339 11340 11341 11342 11343 11344 11345 11346 11347 11348 11349 11350 11351 11352 11353 11354 11355 11356 11357 11358 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 11373 11374 11375 11376 11377 11378 11379 11380 11381 11382 11383 11384 11385 11386 11387 11388 11389 11390 11391 11392 11393 11394 11395 11396 11397 11398 11399 11400 11401 11402 11403 11404 11405 11406 11407 11408 11409 11410 11411 11412 11413 11414 11415 11416 11417 11418 11419 11420 11421 11422 11423 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 11440 11441 11442 11443 11444 11445 11446 11447 11448 11449 11450 11451 11452 11453 11454 11455 11456 11457 11458 11459 11460 11461 11462 11463 11464 11465 11466 11467 11468 11469 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 11481 11482 11483 11484 11485 11486 11487 11488 11489 11490 11491 11492 11493 11494 11495 11496 11497 11498 11499 11500 11501 11502 11503 11504 11505 11506 11507 11508 11509 11510 11511 11512 11513 11514 11515 11516 11517 11518 11519 11520 11521 11522 11523 11524 11525 11526 11527 11528 11529 11530 11531 11532 11533 11534 11535 11536 11537 11538 11539 11540 11541 11542 11543 11544 11545 11546 11547 11548 11549 11550 11551 11552 11553 11554 11555 11556 11557 11558 11559 11560 11561 11562 11563 11564 11565 11566 11567 11568 11569 11570 11571 11572 11573 11574 11575 11576 11577 11578 11579 11580 11581 11582 11583 11584 11585 11586 11587 11588 11589 11590 11591 11592 11593 11594 11595 11596 11597 11598 11599 11600 11601 11602 11603 11604 11605 11606 11607 11608 11609 11610 11611 11612 11613 11614 11615 11616 11617 11618 11619 11620 11621 11622 11623 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 11639 11640 11641 11642 11643 11644 11645 11646 11647 11648 11649 11650 11651 11652 11653 11654 11655 11656 11657 11658 11659 11660 11661 11662 11663 11664 11665 11666 11667 11668 11669 11670 11671 11672 11673 11674 11675 11676 11677 11678 11679 11680 11681 11682 11683 11684 11685 11686 11687 11688 11689 11690 11691 11692 11693 11694 11695 11696 11697 11698 11699 11700 11701 11702 11703 11704 11705 11706 11707 11708 11709 11710 11711 11712 11713 11714 11715 11716 11717 11718 11719 11720 11721 11722 11723 11724 11725 11726 11727 11728 11729 11730 11731 11732 11733 11734 11735 11736 11737 11738 11739 11740 11741 11742 11743 11744 11745 11746 11747 11748 11749 11750 11751 11752 11753 11754 11755 11756 11757 11758 11759 11760 11761 11762 11763 11764 11765 11766 11767 11768 11769 11770 11771 11772 11773 11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 11788 11789 11790 11791 11792 11793 11794 11795 11796 11797 11798 11799 11800 11801 11802 11803 11804 11805 11806 11807 11808 11809 11810 11811 11812 11813 11814 11815 11816 11817 11818 11819 11820 11821 11822 11823 11824 11825 11826 11827 11828 11829 11830 11831 11832 11833 11834 11835 11836 11837 11838 11839 11840 11841 11842 11843 11844 11845 11846 11847 11848 11849 11850 11851 11852 11853 11854 11855 11856 11857 11858 11859 11860 11861 11862 11863 11864 11865 11866 11867 11868 11869 11870 11871 11872 11873 11874 11875 11876 11877 11878 11879 11880 11881 11882 11883 11884 11885 11886 11887 11888 11889 11890 11891 11892 11893 11894 11895 11896 11897 11898 11899 11900 11901 11902 11903 11904 11905 11906 11907 11908 11909 11910 11911 11912 11913 11914 11915 11916 11917 11918 11919 11920 11921 11922 11923 11924 11925 11926 11927 11928 11929 11930 11931 11932 11933 11934 11935 11936 11937 11938 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 11973 11974 11975 11976 11977 11978 11979 11980 11981 11982 11983 11984 11985 11986 11987 11988 11989 11990 11991 11992 11993 11994 11995 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 12006 12007 12008 12009 12010 12011 12012 12013 12014 12015 12016 12017 12018 12019 12020 12021 12022 12023 12024 12025 12026 12027 12028 12029 12030 12031 12032 12033 12034 12035 12036 12037 12038 12039 12040 12041 12042 12043 12044 12045 12046 12047 12048 12049 12050 12051 12052 12053 12054 12055 12056 12057 12058 12059 12060 12061 12062 12063 12064 12065 12066 12067 12068 12069 12070 12071 12072 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 12086 12087 12088 12089 12090 12091 12092 12093 12094 12095 12096 12097 12098 12099 12100 12101 12102 12103 12104 12105 12106 12107 12108 12109 12110 12111 12112 12113 12114 12115 12116 12117 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 12131 12132 12133 12134 12135 12136 12137 12138 12139 12140 12141 12142 12143 12144 12145 12146 12147 12148 12149 12150 12151 12152 12153 12154 12155 12156 12157 12158 12159 12160 12161 12162 12163 12164 12165 12166 12167 12168 12169 12170 12171 12172 12173 12174 12175 12176 12177 12178 12179 12180 12181 12182 12183 12184 12185 12186 12187 12188 12189 12190 12191 12192 12193 12194 12195 12196 12197 12198 12199 12200 12201 12202 12203 12204 12205 12206 12207 12208 12209 12210 12211 12212 12213 12214 12215 12216 12217 12218 12219 12220 12221 12222 12223 12224 12225 12226 12227 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 12251 12252 12253 12254 12255 12256 12257 12258 12259 12260 12261 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 12286 12287 12288 12289 12290 12291 12292 12293 12294 12295 12296 12297 12298 12299 12300 12301 12302 12303 12304 12305 12306 12307 12308 12309 12310 12311 12312 12313 12314 12315 12316 12317 12318 12319 12320 12321 12322 12323 12324 12325 12326 12327 12328 12329 12330 12331 12332 12333 12334 12335 12336 12337 12338 12339 12340 12341 12342 12343 12344 12345 12346 12347 12348 12349 12350 12351 12352 12353 12354 12355 12356 12357 12358 12359 12360 12361 12362 12363 12364 12365 12366 12367 12368 12369 12370 12371 12372 12373 12374 12375 12376 12377 12378 12379 12380 12381 12382 12383 12384 12385 12386 12387 12388 12389 12390 12391 12392 12393 12394 12395 12396 12397 12398 12399 12400 12401 12402 12403 12404 12405 12406 12407 12408 12409 12410 12411 12412 12413 12414 12415 12416 12417 12418 12419 12420 12421 12422 12423 12424 12425 12426 12427 12428 12429 12430 12431 12432 12433 12434 12435 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 12466 12467 12468 12469 12470 12471 12472 12473 12474 12475 12476 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 12488 12489 12490 12491 12492 12493 12494 12495 12496 12497 12498 12499 12500 12501 12502 12503 12504 12505 12506 12507 12508 12509 12510 12511 12512 12513 12514 12515 12516 12517 12518 12519 12520 12521 12522 12523 12524 12525 12526 12527 12528 12529 12530 12531 12532 12533 12534 12535 12536 12537 12538 12539 12540 12541 12542 12543 12544 12545 12546 12547 12548 12549 12550 12551 12552 12553 12554 12555 12556 12557 12558 12559 12560 12561 12562 12563 12564 12565 12566 12567 12568 12569 12570 12571 12572 12573 12574 12575 12576 12577 12578 12579 12580 12581 12582 12583 12584 12585 12586 12587 12588 12589 12590 12591 12592 12593 12594 12595 12596 12597 12598 12599 12600 12601 12602 12603 12604 12605 12606 12607 12608 12609 12610 12611 12612 12613 12614 12615 12616 12617 12618 12619 12620 12621 12622 12623 12624 12625 12626 12627 12628 12629 12630 12631 12632 12633 12634 12635 12636 12637 12638 12639 12640 12641 12642 12643 12644 12645 12646 12647 12648 12649 12650 12651 12652 12653 12654 12655 12656 12657 12658 12659 12660 12661 12662 12663 12664 12665 12666 12667 12668 12669 12670 12671 12672 12673 12674 12675 12676 12677 12678 12679 12680 12681 12682 12683 12684 12685 12686 12687 12688 12689 12690 12691 12692 12693 12694 12695 12696 12697 12698 12699 12700 12701 12702 12703 12704 12705 12706 12707 12708 12709 12710 12711 12712 12713 12714 12715 12716 12717 12718 12719 12720 12721 12722 12723 12724 12725 12726 12727 12728 12729 12730 12731 12732 12733 12734 12735 12736 12737 12738 12739 12740 12741 12742 12743 12744 12745 12746 12747 12748 12749 12750 12751 12752 12753 12754 12755 12756 12757 12758 12759 12760 12761 12762 12763 12764 12765 12766 12767 12768 12769 12770 12771 12772 12773 12774 12775 12776 12777 12778 12779 12780 12781 12782 12783 12784 12785 12786 12787 12788 12789 12790 12791 12792 12793 12794 12795 12796 12797 12798 12799 12800 12801 12802 12803 12804 12805 12806 12807 12808 12809 12810 12811 12812 12813 12814 12815 12816 12817 12818 12819 12820 12821 12822 12823 12824 12825 12826 12827 12828 12829 12830 12831 12832 12833 12834 12835 12836 12837 12838 12839 12840 12841 12842 12843 12844 12845 12846 12847 12848 12849 12850 12851 12852 12853 12854 12855 12856 12857 12858 12859 12860 12861 12862 12863 12864 12865 12866 12867 12868 12869 12870 12871 12872 12873 12874 12875 12876 12877 12878 12879 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 12892 12893 12894 12895 12896 12897 12898 12899 12900 12901 12902 12903 12904 12905 12906 12907 12908 12909 12910 12911 12912 12913 12914 12915 12916 12917 12918 12919 12920 12921 12922 12923 12924 12925 12926 12927 12928 12929 12930 12931 12932 12933 12934 12935 12936 12937 12938 12939 12940 12941 12942 12943 12944 12945 12946 12947 12948 12949 12950 12951 12952 12953 12954 12955 12956 12957 12958 12959 12960 12961 12962 12963 12964 12965 12966 12967 12968 12969 12970 12971 12972 12973 12974 12975 12976 12977 12978 12979 12980 12981 12982 12983 12984 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 13002 13003 13004 13005 13006 13007 13008 13009 13010 13011 13012 13013 13014 13015 13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 13030 13031 13032 13033 13034 13035 13036 13037 13038 13039 13040 13041 13042 13043 13044 13045 13046 13047 13048 13049 13050 13051 13052 13053 13054 13055 13056 13057 13058 13059 13060 13061 13062 13063 13064 13065 13066 13067 13068 13069 13070 13071 13072 13073 13074 13075 13076 13077 13078 13079 13080 13081 13082 13083 13084 13085 13086 13087 13088 13089 13090 13091 13092 13093 13094 13095 13096 13097 13098 13099 13100 13101 13102 13103 13104 13105 13106 13107 13108 13109 13110 13111 13112 13113 13114 13115 13116 13117 13118 13119 13120 13121 13122 13123 13124 13125 13126 13127 13128 13129 13130 13131 13132 13133 13134 13135 13136 13137 13138 13139 13140 13141 13142 13143 13144 13145 13146 13147 13148 13149 13150 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 13175 13176 13177 13178 13179 13180 13181 13182 13183 13184 13185 13186 13187 13188 13189 13190 13191 13192 13193 13194 13195 13196 13197 13198 13199 13200 13201 13202 13203 13204 13205 13206 13207 13208 13209 13210 13211 13212 13213 13214 13215 13216 13217 13218 13219 13220 13221 13222 13223 13224 13225 13226 13227 13228 13229 13230 13231 13232 13233 13234 13235 13236 13237 13238 13239 13240 13241 13242 13243 13244 13245 13246 13247 13248 13249 13250 13251 13252 13253 13254 13255 13256 13257 13258 13259 13260 13261 13262 13263 13264 13265 13266 13267 13268 13269 13270 13271 13272 13273 13274 13275 13276 13277 13278 13279 13280 13281 13282 13283 13284 13285 13286 13287 13288 13289 13290 13291 13292 13293 13294 13295 13296 13297 13298 13299 13300 13301 13302 13303 13304 13305 13306 13307 13308 13309 13310 13311 13312 13313 13314 13315 13316 13317 13318 13319 13320 13321 13322 13323 13324 13325 13326 13327 13328 13329 13330 13331 13332 13333 13334 13335 13336 13337 13338 13339 13340 13341 13342 13343 13344 13345 13346 13347 13348 13349 13350 13351 13352 13353 13354 13355 13356 13357 13358 13359 13360 13361 13362 13363 13364 13365 13366 13367 13368 13369 13370 13371 13372 13373 13374 13375 13376 13377 13378 13379 13380 13381 13382 13383 13384 13385 13386 13387 13388 13389 13390 13391 13392 13393 13394 13395 13396 13397 13398 13399 13400 13401 13402 13403 13404 13405 13406 13407 13408 13409 13410 13411 13412 13413 13414 13415 13416 13417 13418 13419 13420 13421 13422 13423 13424 13425 13426 13427 13428 13429 13430 13431 13432 13433 13434 13435 13436 13437 13438 13439 13440 13441 13442 13443 13444 13445 13446 13447 13448 13449 13450 13451 13452 13453 13454 13455 13456 13457 13458 13459 13460 13461 13462 13463 13464 13465 13466 13467 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 13486 13487 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 13504 13505 13506 13507 13508 13509 13510 13511 13512 13513 13514 13515 13516 13517 13518 13519 13520 13521 13522 13523 13524 13525 13526 13527 13528 13529 13530 13531 13532 13533 13534 13535 13536 13537 13538 13539 13540 13541 13542 13543 13544 13545 13546 13547 13548 13549 13550 13551 13552 13553 13554 13555 13556 13557 13558 13559 13560 13561 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 13575 13576 13577 13578 13579 13580 13581 13582 13583 13584 13585 13586 13587 13588 13589 13590 13591 13592 13593 13594 13595 13596 13597 13598 13599 13600 13601 13602 13603 13604 13605 13606 13607 13608 13609 13610 13611 13612 13613 13614 13615 13616 13617 13618 13619 13620 13621 13622 13623 13624 13625 13626 13627 13628 13629 13630 13631 13632 13633 13634 13635 13636 13637 13638 13639 13640 13641 13642 13643 13644 13645 13646 13647 13648 13649 13650 13651 13652 13653 13654 13655 13656 13657 13658 13659 13660 13661 13662 13663 13664 13665 13666 13667 13668 13669 13670 13671 13672 13673 13674 13675 13676 13677 13678 13679 13680 13681 13682 13683 13684 13685 13686 13687 13688 13689 13690 13691 13692 13693 13694 13695 13696 13697 13698 13699 13700 13701 13702 13703 13704 13705 13706 13707 13708 13709 13710 13711 13712 13713 13714 13715 13716 13717 13718 13719 13720 13721 13722 13723 13724 13725 13726 13727 13728 13729 13730 13731 13732 13733 13734 13735 13736 13737 13738 13739 13740 13741 13742 13743 13744 13745 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 13758 13759 13760 13761 13762 13763 13764 13765 13766 13767 13768 13769 13770 13771 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 13799 13800 13801 13802 13803 13804 13805 13806 13807 13808 13809 13810 13811 13812 13813 13814 13815 13816 13817 13818 13819 13820 13821 13822 13823 13824 13825 13826 13827 13828 13829 13830 13831 13832 13833 13834 13835 13836 13837 13838 13839 13840 13841 13842 13843 13844 13845 13846 13847 13848 13849 13850 13851 13852 13853 13854 13855 13856 13857 13858 13859 13860 13861 13862 13863 13864 13865 13866 13867 13868 13869 13870 13871 13872 13873 13874 13875 13876 13877 13878 13879 13880 13881 13882 13883 13884 13885 13886 13887 13888 13889 13890 13891 13892 13893 13894 13895 13896 13897 13898 13899 13900 13901 13902 13903 13904 13905 13906 13907 13908 13909 13910 13911 13912 13913 13914 13915 13916 13917 13918 13919 13920 13921 13922 13923 13924 13925 13926 13927 13928 13929 13930 13931 13932 13933 13934 13935 13936 13937 13938 13939 13940 13941 13942 13943 13944 13945 13946 13947 13948 13949 13950 13951 13952 13953 13954 13955 13956 13957 13958 13959 13960 13961 13962 13963 13964 13965 13966 13967 13968 13969 13970 13971 13972 13973 13974 13975 13976 13977 13978 13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 13990 13991 13992 13993 13994 13995 13996 13997 13998 13999 14000 14001 14002 14003 14004 14005 14006 14007 14008 14009 14010 14011 14012 14013 14014 14015 14016 14017 14018 14019 14020 14021 14022 14023 14024 14025 14026 14027 14028 14029 14030 14031 14032 14033 14034 14035 14036 14037 14038 14039 14040 14041 14042 14043 14044 14045 14046 14047 14048 14049 14050 14051 14052 14053 14054 14055 14056 14057 14058 14059 14060 14061 14062 14063 14064 14065 14066 14067 14068 14069 14070 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 14128 14129 14130 14131 14132 14133 14134 14135 14136 14137 14138 14139 14140 14141 14142 14143 14144 14145 14146 14147 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 14181 14182 14183 14184 14185 14186 14187 14188 14189 14190 14191 14192 14193 14194 14195 14196 14197 14198 14199 14200 14201 14202 14203 14204 14205 14206 14207 14208 14209 14210 14211 14212 14213 14214 14215 14216 14217 14218 14219 14220 14221 14222 14223 14224 14225 14226 14227 14228 14229 14230 14231 14232 14233 14234 14235 14236 14237 14238 14239 14240 14241 14242 14243 14244 14245 14246 14247 14248 14249 14250 14251 14252 14253 14254 14255 14256 14257 14258 14259 14260 14261 14262 14263 14264 14265 14266 14267 14268 14269 14270 14271 14272 14273 14274 14275 14276 14277 14278 14279 14280 14281 14282 14283 14284 14285 14286 14287 14288 14289 14290 14291 14292 14293 14294 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 14361 14362 14363 14364 14365 14366 14367 14368 14369 14370 14371 14372 14373 14374 14375 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 14448 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 14506 14507 14508 14509 14510 14511 14512 14513 14514 14515 14516 14517 14518 14519 14520 14521 14522 14523 14524 14525 14526 14527 14528 14529 14530 14531 14532 14533 14534 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 14545 14546 14547 14548 14549 14550 14551 14552 14553 14554 14555 14556 14557 14558 14559 14560 14561 14562 14563 14564 14565 14566 14567 14568 14569 14570 14571 14572 14573 14574 14575 14576 14577 14578 14579 14580 14581 14582 14583 14584 14585 14586 14587 14588 14589 14590 14591 14592 14593 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 14667 14668 14669 14670 14671 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 14691 14692 14693 14694 14695 14696 14697 14698 14699 14700 14701 14702 14703 14704 14705 14706 14707 14708 14709 14710 14711 14712 14713 14714 14715 14716 14717 14718 14719 14720 14721 14722 14723 14724 14725 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767 14768 14769 14770 14771 14772 14773 14774 14775 14776 14777 14778 14779 14780 14781 14782 14783 14784 14785 14786 14787 14788 14789 14790 14791 14792 14793 14794 14795 14796 14797 14798 14799 14800 14801 14802 14803 14804 14805 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 14821 14822 14823 14824 14825 14826 14827 14828 14829 14830 14831 14832 14833 14834 14835 14836 14837 14838 14839 14840 14841 14842 14843 14844 14845 14846 14847 14848 14849 14850 14851 14852 14853 14854 14855 14856 14857 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 14870 14871 14872 14873 14874 14875 14876 14877 14878 14879 14880 14881 14882 14883 14884 14885 14886 14887 14888 14889 14890 14891 14892 14893 14894 14895 14896 14897 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 14914 14915 14916 14917 14918 14919 14920 14921 14922 14923 14924 14925 14926 14927 14928 14929 14930 14931 14932 14933 14934 14935 14936 14937 14938 14939 14940 14941 14942 14943 14944 14945 14946 14947 14948 14949 14950 14951 14952 14953 14954 14955 14956 14957 14958 14959 14960 14961 14962 14963 14964 14965 14966 14967 14968 14969 14970 14971 14972 14973 14974 14975 14976 14977 14978 14979 14980 14981 14982 14983 14984 14985 14986 14987 14988 14989 14990 14991 14992 14993 14994 14995 14996 14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 15009 15010 15011 15012 15013 15014 15015 15016 15017 15018 15019 15020 15021 15022 15023 15024 15025 15026 15027 15028 15029 15030 15031 15032 15033 15034 15035 15036 15037 15038 15039 15040 15041 15042 15043 15044 15045 15046 15047 15048 15049 15050 15051 15052 15053 15054 15055 15056 15057 15058 15059 15060 15061 15062 15063 15064 15065 15066 15067 15068 15069 15070 15071 15072 15073 15074 15075 15076 15077 15078 15079 15080 15081 15082 15083 15084 15085 15086 15087 15088 15089 15090 15091 15092 15093 15094 15095 15096 15097 15098 15099 15100 15101 15102 15103 15104 15105 15106 15107 15108 15109 15110 15111 15112 15113 15114 15115 15116 15117 15118 15119 15120 15121 15122 15123 15124 15125 15126 15127 15128 15129 15130 15131 15132 15133 15134 15135 15136 15137 15138 15139 15140 15141 15142 15143 15144 15145 15146 15147 15148 15149 15150 15151 15152 15153 15154 15155 15156 15157 15158 15159 15160 15161 15162 15163 15164 15165 15166 15167 15168 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 15182 15183 15184 15185 15186 15187 15188 15189 15190 15191 15192 15193 15194 15195 15196 15197 15198 15199 15200 15201 15202 15203 15204 15205 15206 15207 15208 15209 15210 15211 15212 15213 15214 15215 15216 15217 15218 15219 15220 15221 15222 15223 15224 15225 15226 15227 15228 15229 15230 15231 15232 15233 15234 15235 15236 15237 15238 15239 15240 15241 15242 15243 15244 15245 15246 15247 15248 15249 15250 15251 15252 15253 15254 15255 15256 15257 15258 15259 15260 15261 15262 15263 15264 15265 15266 15267 15268 15269 15270 15271 15272 15273 15274 15275 15276 15277 15278 15279 15280 15281 15282 15283 15284 15285 15286 15287 15288 15289 15290 15291 15292 15293 15294 15295 15296 15297 15298 15299 15300 15301 15302 15303 15304 15305 15306 15307 15308 15309 15310 15311 15312 15313 15314 15315 15316 15317 15318 15319 15320 15321 15322 15323 15324 15325 15326 15327 15328 15329 15330 15331 15332 15333 15334 15335 15336 15337 15338 15339 15340 15341 15342 15343 15344 15345 15346 15347 15348 15349 15350 15351 15352 15353 15354 15355 15356 15357 15358 15359 15360 15361 15362 15363 15364 15365 15366 15367 15368 15369 15370 15371 15372 15373 15374 15375 15376 15377 15378 15379 15380 15381 15382 15383 15384 15385 15386 15387 15388 15389 15390 15391 15392 15393 15394 15395 15396 15397 15398 15399 15400 15401 15402 15403 15404 15405 15406 15407 15408 15409 15410 15411 15412 15413 15414 15415 15416 15417 15418 15419 15420 15421 15422 15423 15424 15425 15426 15427 15428 15429 15430 15431 15432 15433 15434 15435 15436 15437 15438 15439 15440 15441 15442 15443 15444 15445 15446 15447 15448 15449 15450 15451 15452 15453 15454 15455 15456 15457 15458 15459 15460 15461 15462 15463 15464 15465 15466 15467 15468 15469 15470 15471 15472 15473 15474 15475 15476 15477 15478 15479 15480 15481 15482 15483 15484 15485 15486 15487 15488 15489 15490 15491 15492 15493 15494 15495 15496 15497 15498 15499 15500 15501 15502 15503 15504 15505 15506 15507 15508 15509 15510 15511 15512 15513 15514 15515 15516 15517 15518 15519 15520 15521 15522 15523 15524 15525 15526 15527 15528 15529 15530 15531 15532 15533 15534 15535 15536 15537 15538 15539 15540 15541 15542 15543 15544 15545 15546 15547 15548 15549 15550 15551 15552 15553 15554 15555 15556 15557 15558 15559 15560 15561 15562 15563 15564 15565 15566 15567 15568 15569 15570 15571 15572 15573 15574 15575 15576 15577 15578 15579 15580 15581 15582 15583 15584 15585 15586 15587 15588 15589 15590 15591 15592 15593 15594 15595 15596 15597 15598 15599 15600 15601 15602 15603 15604 15605 15606 15607 15608 15609 15610 15611 15612 15613 15614 15615 15616 15617 15618 15619 15620 15621 15622 15623 15624 15625 15626 15627 15628 15629 15630 15631 15632 15633 15634 15635 15636 15637 15638 15639 15640 15641 15642 15643 15644 15645 15646 15647 15648 15649 15650 15651 15652 15653 15654 15655 15656 15657 15658 15659 15660 15661 15662 15663 15664 15665 15666 15667 15668 15669 15670 15671 15672 15673 15674 15675 15676 15677 15678 15679 15680 15681 15682 15683 15684 15685 15686 15687 15688 15689 15690 15691 15692 15693 15694 15695 15696 15697 15698 15699 15700 15701 15702 15703 15704 15705 15706 15707 15708 15709 15710 15711 15712 15713 15714 15715 15716 15717 15718 15719 15720 15721 15722 15723 15724 15725 15726 15727 15728 15729 15730 15731 15732 15733 15734 15735 15736 15737 15738 15739 15740 15741 15742 15743 15744 15745 15746 15747 15748 15749 15750 15751 15752 15753 15754 15755 15756 15757 15758 15759 15760 15761 15762 15763 15764 15765 15766 15767 15768 15769 15770 15771 15772 15773 15774 15775 15776 15777 15778 15779 15780 15781 15782 15783 15784 15785 15786 15787 15788 15789 15790 15791 15792 15793 15794 15795 15796 15797 15798 15799 15800 15801 15802 15803 15804 15805 15806 15807 15808 15809 15810 15811 15812 15813 15814 15815 15816 15817 15818 15819 15820 15821 15822 15823 15824 15825 15826 15827 15828 15829 15830 15831 15832 15833 15834 15835 15836 15837 15838 15839 15840 15841 15842 15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 15859 15860 15861 15862 15863 15864 15865 15866 15867 15868 15869 15870 15871 15872 15873 15874 15875 15876 15877 15878 15879 15880 15881 15882 15883 15884 15885 15886 15887 15888 15889 15890 15891 15892 15893 15894 15895 15896 15897 15898 15899 15900 15901 15902 15903 15904 15905 15906 15907 15908 15909 15910 15911 15912 15913 15914 15915 15916 15917 15918 15919 15920 15921 15922 15923 15924 15925 15926 15927 15928 15929 15930 15931 15932 15933 15934 15935 15936 15937 15938 15939 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 15969 15970 15971 15972 15973 15974 15975 15976 15977 15978 15979 15980 15981 15982 15983 15984 15985 15986 15987 15988 15989 15990 15991 15992 15993 15994 15995 15996 15997 15998 15999 16000 16001 16002 16003 16004 16005 16006 16007 16008 16009 16010 16011 16012 16013 16014 16015 16016 16017 16018 16019 16020 16021 16022 16023 16024 16025 16026 16027 16028 16029 16030 16031 16032 16033 16034 16035 16036 16037 16038 16039 16040 16041 16042 16043 16044 16045 16046 16047 16048 16049 16050 16051 16052 16053 16054 16055 16056 16057 16058 16059 16060 16061 16062 16063 16064 16065 16066 16067 16068 16069 16070 16071 16072 16073 16074 16075 16076 16077 16078 16079 16080 16081 16082 16083 16084 16085 16086 16087 16088 16089 16090 16091 16092 16093 16094 16095 16096 16097 16098 16099 16100 16101 16102 16103 16104 16105 16106 16107 16108 16109 16110 16111 16112 16113 16114 16115 16116 16117 16118 16119 16120 16121 16122 16123 16124 16125 16126 16127 16128 16129 16130 16131 16132 16133 16134 16135 16136 16137 16138 16139 16140 16141 16142 16143 16144 16145 16146 16147 16148 16149 16150 16151 16152 16153 16154 16155 16156 16157 16158 16159 16160 16161 16162 16163 16164 16165 16166 16167 16168 16169 16170 16171 16172 16173 16174 16175 16176 16177 16178 16179 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 16201 16202 16203 16204 16205 16206 16207 16208 16209 16210 16211 16212 16213 16214 16215 16216 16217 16218 16219 16220 16221 16222 16223 16224 16225 16226 16227 16228 16229 16230 16231 16232 16233 16234 16235 16236 16237 16238 16239 16240 16241 16242 16243 16244 16245 16246 16247 16248 16249 16250 16251 16252 16253 16254 16255 16256 16257 16258 16259 16260 16261 16262 16263 16264 16265 16266 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 16282 16283 16284 16285 16286 16287 16288 16289 16290 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 16320 16321 16322 16323 16324 16325 16326 16327 16328 16329 16330 16331 16332 16333 16334 16335 16336 16337 16338 16339 16340 16341 16342 16343 16344 16345 16346 16347 16348 16349 16350 16351 16352 16353 16354 16355 16356 16357 16358 16359 16360 16361 16362 16363 16364 16365 16366 16367 16368 16369 16370 16371 16372 16373 16374 16375 16376 16377 16378 16379 16380 16381 16382 16383 16384 16385 16386 16387 16388 16389 16390 16391 16392 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403 16404 16405 16406 16407 16408 16409 16410 16411 16412 16413 16414 16415 16416 16417 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 16479 16480 16481 16482 16483 16484 16485 16486 16487 16488 16489 16490 16491 16492 16493 16494 16495 16496 16497 16498 16499 16500 16501 16502 16503 16504 16505 16506 16507 16508 16509 16510 16511 16512 16513 16514 16515 16516 16517 16518 16519 16520 16521 16522 16523 16524 16525 16526 16527 16528 16529 16530 16531 16532 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 16548 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 16559 16560 16561 16562 16563 16564 16565 16566 16567 16568 16569 16570 16571 16572 16573 16574 16575 16576 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 16608 16609 16610 16611 16612 16613 16614 16615 16616 16617 16618 16619 16620 16621 16622 16623 16624 16625 16626 16627 16628 16629 16630 16631 16632 16633 16634 16635 16636 16637 16638 16639 16640 16641 16642 16643 16644 16645 16646 16647 16648 16649 16650 16651 16652 16653 16654 16655 16656 16657 16658 16659 16660 16661 16662 16663 16664 16665 16666 16667 16668 16669 16670 16671 16672 16673 16674 16675 16676 16677 16678 16679 16680 16681 16682 16683 16684 16685 16686 16687 16688 16689 16690 16691 16692 16693 16694 16695 16696 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 16711 16712 16713 16714 16715 16716 16717 16718 16719 16720 16721 16722 16723 16724 16725 16726 16727 16728 16729 16730 16731 16732 16733 16734 16735 16736 16737 16738 16739 16740 16741 16742 16743 16744 16745 16746 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 16769 16770 16771 16772 16773 16774 16775 16776 16777 16778 16779 16780 16781 16782 16783 16784 16785 16786 16787 16788 16789 16790 16791 16792 16793 16794 16795 16796 16797 16798 16799 16800 16801 16802 16803 16804 16805 16806 16807 16808 16809 16810 16811 16812 16813 16814 16815 16816 16817 16818 16819 16820 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 16835 16836 16837 16838 16839 16840 16841 16842 16843 16844 16845 16846 16847 16848 16849 16850 16851 16852 16853 16854 16855 16856 16857 16858 16859 16860 16861 16862 16863 16864 16865 16866 16867 16868 16869 16870 16871 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 16883 16884 16885 16886 16887 16888 16889 16890 16891 16892 16893 16894 16895 16896 16897 16898 16899 16900 16901 16902 16903 16904 16905 16906 16907 16908 16909 16910 16911 16912 16913 16914 16915 16916 16917 16918 16919 16920 16921 16922 16923 16924 16925 16926 16927 16928 16929 16930 16931 16932 16933 16934 16935 16936 16937 16938 16939 16940 16941 16942 16943 16944 16945 16946 16947 16948 16949 16950 16951 16952 16953 16954 16955 16956 16957 16958 16959 16960 16961 16962 16963 16964 16965 16966 16967 16968 16969 16970 16971 16972 16973 16974 16975 16976 16977 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 16993 16994 16995 16996 16997 16998 16999 17000 17001 17002 17003 17004 17005 17006 17007 17008 17009 17010 17011 17012 17013 17014 17015 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 17029 17030 17031 17032 17033 17034 17035 17036 17037 17038 17039 17040 17041 17042 17043 17044 17045 17046 17047 17048 17049 17050 17051 17052 17053 17054 17055 17056 17057 17058 17059 17060 17061 17062 17063 17064 17065 17066 17067 17068 17069 17070 17071 17072 17073 17074 17075 17076 17077 17078 17079 17080 17081 17082 17083 17084 17085 17086 17087 17088 17089 17090 17091 17092 17093 17094 17095 17096 17097 17098 17099 17100 17101 17102 17103 17104 17105 17106 17107 17108 17109 17110 17111 17112 17113 17114 17115 17116 17117 17118 17119 17120 17121 17122 17123 17124 17125 17126 17127 17128 17129 17130 17131 17132 17133 17134 17135 17136 17137 17138 17139 17140 17141 17142 17143 17144 17145 17146 17147 17148 17149 17150 17151 17152 17153 17154 17155 17156 17157 17158 17159 17160 17161 17162 17163 17164 17165 17166 17167 17168 17169 17170 17171 17172 17173 17174 17175 17176 17177 17178 17179 17180 17181 17182 17183 17184 17185 17186 17187 17188 17189 17190 17191 17192 17193 17194 17195 17196 17197 17198 17199 17200 17201 17202 17203 17204 17205 17206 17207 17208 17209 17210 17211 17212 17213 17214 17215 17216 17217 17218 17219 17220 17221 17222 17223 17224 17225 17226 17227 17228 17229 17230 17231 17232 17233 17234 17235 17236 17237 17238 17239 17240 17241 17242 17243 17244 17245 17246 17247 17248 17249 17250 17251 17252 17253 17254 17255 17256 17257 17258 17259 17260 17261 17262 17263 17264 17265 17266 17267 17268 17269 17270 17271 17272 17273 17274 17275 17276 17277 17278 17279 17280 17281 17282 17283 17284 17285 17286 17287 17288 17289 17290 17291 17292 17293 17294 17295 17296 17297 17298 17299 17300 17301 17302 17303 17304 17305 17306 17307 17308 17309 17310 17311 17312 17313 17314 17315 17316 17317 17318 17319 17320 17321 17322 17323 17324 17325 17326 17327 17328 17329 17330 17331 17332 17333 17334 17335 17336 17337 17338 17339 17340 17341 17342 17343 17344 17345 17346 17347 17348 17349 17350 17351 17352 17353 17354 17355 17356 17357 17358 17359 17360 17361 17362 17363 17364 17365 17366 17367 17368 17369 17370 17371 17372 17373 17374 17375 17376 17377 17378 17379 17380 17381 17382 17383 17384 17385 17386 17387 17388 17389 17390 17391 17392 17393 17394 17395 17396 17397 17398 17399 17400 17401 17402 17403 17404 17405 17406 17407 17408 17409 17410 17411 17412 17413 17414 17415 17416 17417 17418 17419 17420 17421 17422 17423 17424 17425 17426 17427 17428 17429 17430 17431 17432 17433 17434 17435 17436 17437 17438 17439 17440 17441 17442 17443 17444 17445 17446 17447 17448 17449 17450 17451 17452 17453 17454 17455 17456 17457 17458 17459 17460 17461 17462 17463 17464 17465 17466 17467 17468 17469 17470 17471 17472 17473 17474 17475 17476 17477 17478 17479 17480 17481 17482 17483 17484 17485 17486 17487 17488 17489 17490 17491 17492 17493 17494 17495 17496 17497 17498 17499 17500 17501 17502 17503 17504 17505 17506 17507 17508 17509 17510 17511 17512 17513 17514 17515 17516 17517 17518 17519 17520 17521 17522 17523 17524 17525 17526 17527 17528 17529 17530 17531 17532 17533 17534 17535 17536 17537 17538 17539 17540 17541 17542 17543 17544 17545 17546 17547 17548 17549 17550 17551 17552 17553 17554 17555 17556 17557 17558 17559 17560 17561 17562 17563 17564 17565 17566 17567 17568 17569 17570 17571 17572 17573 17574 17575 17576 17577 17578 17579 17580 17581 17582 17583 17584 17585 17586 17587 17588 17589 17590 17591 17592 17593 17594 17595 17596 17597 17598 17599 17600 17601 17602 17603 17604 17605 17606 17607 17608 17609 17610 17611 17612 17613 17614 17615 17616 17617 17618 17619 17620 17621 17622 17623 17624 17625 17626 17627 17628 17629 17630 17631 17632 17633 17634 17635 17636 17637 17638 17639 17640 17641 17642 17643 17644 17645 17646 17647 17648 17649 17650 17651 17652 17653 17654 17655 17656 17657 17658 17659 17660 17661 17662 17663 17664 17665 17666 17667 17668 17669 17670 17671 17672 17673 17674 17675 17676 17677 17678 17679 17680 17681 17682 17683 17684 17685 17686 17687 17688 17689 17690 17691 17692 17693 17694 17695 17696 17697 17698 17699 17700 17701 17702 17703 17704 17705 17706 17707 17708 17709 17710 17711 17712 17713 17714 17715 17716 17717 17718 17719 17720 17721 17722 17723 17724 17725 17726 17727 17728 17729 17730 17731 17732 17733 17734 17735 17736 17737 17738 17739 17740 17741 17742 17743 17744 17745 17746 17747 17748 17749 17750 17751 17752 17753 17754 17755 17756 17757 17758 17759 17760 17761 17762 17763 17764 17765 17766 17767 17768 17769 17770 17771 17772 17773 17774 17775 17776 17777 17778 17779 17780 17781 17782 17783 17784 17785 17786 17787 17788 17789 17790 17791 17792 17793 17794 17795 17796 17797 17798 17799 17800 17801 17802 17803 17804 17805 17806 17807 17808 17809 17810 17811 17812 17813 17814 17815 17816 17817 17818 17819 17820 17821 17822 17823 17824 17825 17826 17827 17828 17829 17830 17831 17832 17833 17834 17835 17836 17837 17838 17839 17840 17841 17842 17843 17844 17845 17846 17847 17848 17849 17850 17851 17852 17853 17854 17855 17856 17857 17858 17859 17860 17861 17862 17863 17864 17865 17866 17867 17868 17869 17870 17871 17872 17873 17874 17875 17876 17877 17878 17879 17880 17881 17882 17883 17884 17885 17886 17887 17888 17889 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899 17900 17901 17902 17903 17904 17905 17906 17907 17908 17909 17910 17911 17912 17913 17914 17915 17916 17917 17918 17919 17920 17921 17922 17923 17924 17925 17926 17927 17928 17929 17930 17931 17932 17933 17934 17935 17936 17937 17938 17939 17940 17941 17942 17943 17944 17945 17946 17947 17948 17949 17950 17951 17952 17953 17954 17955 17956 17957 17958 17959 17960 17961 17962 17963 17964 17965 17966 17967 17968 17969 17970 17971 17972 17973 17974 17975 17976 17977 17978 17979 17980 17981 17982 17983 17984 17985 17986 17987 17988 17989 17990 17991 17992 17993 17994 17995 17996 17997 17998 17999 18000 18001 18002 18003 18004 18005 18006 18007 18008 18009 18010 18011 18012 18013 18014 18015 18016 18017 18018 18019 18020 18021 18022 18023 18024 18025 18026 18027 18028 18029 18030 18031 18032 18033 18034 18035 18036 18037 18038 18039 18040 18041 18042 18043 18044 18045 18046 18047 18048 18049 18050 18051 18052 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 18069 18070 18071 18072 18073 18074 18075 18076 18077 18078 18079 18080 18081 18082 18083 18084 18085 18086 18087 18088 18089 18090 18091 18092 18093 18094 18095 18096 18097 18098 18099 18100 18101 18102 18103 18104 18105 18106 18107 18108 18109 18110 18111 18112 18113 18114 18115 18116 18117 18118 18119 18120 18121 18122 18123 18124 18125 18126 18127 18128 18129 18130 18131 18132 18133 18134 18135 18136 18137 18138 18139 18140 18141 18142 18143 18144 18145 18146 18147 18148 18149 18150 18151 18152 18153 18154 18155 18156 18157 18158 18159 18160 18161 18162 18163 18164 18165 18166 18167 18168 18169 18170 18171 18172 18173 18174 18175 18176 18177 18178 18179 18180 18181 18182 18183 18184 18185 18186 18187 18188 18189 18190 18191 18192 18193 18194 18195 18196 18197 18198 18199 18200 18201 18202 18203 18204 18205 18206 18207 18208 18209 18210 18211 18212 18213 18214 18215 18216 18217 18218 18219 18220 18221 18222 18223 18224 18225 18226 18227 18228 18229 18230 18231 18232 18233 18234 18235 18236 18237 18238 18239 18240 18241 18242 18243 18244 18245 18246 18247 18248 18249 18250 18251 18252 18253 18254 18255 18256 18257 18258 18259 18260 18261 18262 18263 18264 18265 18266 18267 18268 18269 18270 18271 18272 18273 18274 18275 18276 18277 18278 18279 18280 18281 18282 18283 18284 18285 18286 18287 18288 18289 18290 18291 18292 18293 18294 18295 18296 18297 18298 18299 18300 18301 18302 18303 18304 18305 18306 18307 18308 18309 18310 18311 18312 18313 18314 18315 18316 18317 18318 18319 18320 18321 18322 18323 18324 18325 18326 18327 18328 18329 18330 18331 18332 18333 18334 18335 18336 18337 18338 18339 18340 18341 18342 18343 18344 18345 18346 18347 18348 18349 18350 18351 18352 18353 18354 18355 18356 18357 18358 18359 18360 18361 18362 18363 18364 18365 18366 18367 18368 18369 18370 18371 18372 18373 18374 18375 18376 18377 18378 18379 18380 18381 18382 18383 18384 18385 18386 18387 18388 18389 18390 18391 18392 18393 18394 18395 18396 18397 18398 18399 18400 18401 18402 18403 18404 18405 18406 18407 18408 18409 18410 18411 18412 18413 18414 18415 18416 18417 18418 18419 18420 18421 18422 18423 18424 18425 18426 18427 18428 18429 18430 18431 18432 18433 18434 18435 18436 18437 18438 18439 18440 18441 18442 18443 18444 18445 18446 18447 18448 18449 18450 18451 18452 18453 18454 18455 18456 18457 18458 18459 18460 18461 18462 18463 18464 18465 18466 18467 18468 18469 18470 18471 18472 18473 18474 18475 18476 18477 18478 18479 18480 18481 18482 18483 18484 18485 18486 18487 18488 18489 18490 18491 18492 18493 18494 18495 18496 18497 18498 18499 18500 18501 18502 18503 18504 18505 18506 18507 18508 18509 18510 18511 18512 18513 18514 18515 18516 18517 18518 18519 18520 18521 18522 18523 18524 18525 18526 18527 18528 18529 18530 18531 18532 18533 18534 18535 18536 18537 18538 18539 18540 18541 18542 18543 18544 18545 18546 18547 18548 18549 18550 18551 18552 18553 18554 18555 18556 18557 18558 18559 18560 18561 18562 18563 18564 18565 18566 18567 18568 18569 18570 18571 18572 18573 18574 18575 18576 18577 18578 18579 18580 18581 18582 18583 18584 18585 18586 18587 18588 18589 18590 18591 18592 18593 18594 18595 18596 18597 18598 18599 18600 18601 18602 18603 18604 18605 18606 18607 18608 18609 18610 18611 18612 18613 18614 18615 18616 18617 18618 18619 18620 18621 18622 18623 18624 18625 18626 18627 18628 18629 18630 18631 18632 18633 18634 18635 18636 18637 18638 18639 18640 18641 18642 18643 18644 18645 18646 18647 18648 18649 18650 18651 18652 18653 18654 18655 18656 18657 18658 18659 18660 18661 18662 18663 18664 18665 18666 18667 18668 18669 18670 18671 18672 18673 18674 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 18685 18686 18687 18688 18689 18690 18691 18692 18693 18694 18695 18696 18697 18698 18699 18700 18701 18702 18703 18704 18705 18706 18707 18708 18709 18710 18711 18712 18713 18714 18715 18716 18717 18718 18719 18720 18721 18722 18723 18724 18725 18726 18727 18728 18729 18730 18731 18732 18733 18734 18735 18736 18737 18738 18739 18740 18741 18742 18743 18744 18745 18746 18747 18748 18749 18750 18751 18752 18753 18754 18755 18756 18757 18758 18759 18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 18771 18772 18773 18774 18775 18776 18777 18778 18779 18780 18781 18782 18783 18784 18785 18786 18787 18788 18789 18790 18791 18792 18793 18794 18795 18796 18797 18798 18799 18800 18801 18802 18803 18804 18805 18806 18807 18808 18809 18810 18811 18812 18813 18814 18815 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 18836 18837 18838 18839 18840 18841 18842 18843 18844 18845 18846 18847 18848 18849 18850 18851 18852 18853 18854 18855 18856 18857 18858 18859 18860 18861 18862 18863 18864 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 18880 18881 18882 18883 18884 18885 18886 18887 18888 18889 18890 18891 18892 18893 18894 18895 18896 18897 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 18911 18912 18913 18914 18915 18916 18917 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 18952 18953 18954 18955 18956 18957 18958 18959 18960 18961 18962 18963 18964 18965 18966 18967 18968 18969 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 18997 18998 18999 19000 19001 19002 19003 19004 19005 19006 19007 19008 19009 19010 19011 19012 19013 19014 19015 19016 19017 19018 19019 19020 19021 19022 19023 19024 19025 19026 19027 19028 19029 19030 19031 19032 19033 19034 19035 19036 19037 19038 19039 19040 19041 19042 19043 19044 19045 19046 19047 19048 19049 19050 19051 19052 19053 19054 19055 19056 19057 19058 19059 19060 19061 19062 19063 19064 19065 19066 19067 19068 19069 19070 19071 19072 19073 19074 19075 19076 19077 19078 19079 19080 19081 19082 19083 19084 19085 19086 19087 19088 19089 19090 19091 19092 19093 19094 19095 19096 19097 19098 19099 19100 19101 19102 19103 19104 19105 19106 19107 19108 19109 19110 19111 19112 19113 19114 19115 19116 19117 19118 19119 19120 19121 19122 19123 19124 19125 19126 19127 19128 19129 19130 19131 19132 19133 19134 19135 19136 19137 19138 19139 19140 19141 19142 19143 19144 19145 19146 19147 19148 19149 19150 19151 19152 19153 19154 19155 19156 19157 19158 19159 19160 19161 19162 19163 19164 19165 19166 19167 19168 19169 19170 19171 19172 19173 19174 19175 19176 19177 19178 19179 19180 19181 19182 19183 19184 19185 19186 19187 19188 19189 19190 19191 19192 19193 19194 19195 19196 19197 19198 19199 19200 19201 19202 19203 19204 19205 19206 19207 19208 19209 19210 19211 19212 19213 19214 19215 19216 19217 19218 19219 19220 19221 19222 19223 19224 19225 19226 19227 19228 19229 19230 19231 19232 19233 19234 19235 19236 19237 19238 19239 19240 19241 19242 19243 19244 19245 19246 19247 19248 19249 19250 19251 19252 19253 19254 19255 19256 19257 19258 19259 19260 19261 19262 19263 19264 19265 19266 19267 19268 19269 19270 19271 19272 19273 19274 19275 19276 19277 19278 19279 19280 19281 19282 19283 19284 19285 19286 19287 19288 19289 19290 19291 19292 19293 19294 19295 19296 19297 19298 19299 19300 19301 19302 19303 19304 19305 19306 19307 19308 19309 19310 19311 19312 19313 19314 19315 19316 19317 19318 19319 19320 19321 19322 19323 19324 19325 19326 19327 19328 19329 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 19358 19359 19360 19361 19362 19363 19364 19365 19366 19367 19368 19369 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 19382 19383 19384 19385 19386 19387 19388 19389 19390 19391 19392 19393 19394 19395 19396 19397 19398 19399 19400 19401 19402 19403 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 19440 19441 19442 19443 19444 19445 19446 19447 19448 19449 19450 19451 19452 19453 19454 19455 19456 19457 19458 19459 19460 19461 19462 19463 19464 19465 19466 19467 19468 19469 19470 19471 19472 19473 19474 19475 19476 19477 19478 19479 19480 19481 19482 19483 19484 19485 19486 19487 19488 19489 19490 19491 19492 19493 19494 19495 19496 19497 19498 19499 19500 19501 19502 19503 19504 19505 19506 19507 19508 19509 19510 19511 19512 19513 19514 19515 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 19528 19529 19530 19531 19532 19533 19534 19535 19536 19537 19538 19539 19540 19541 19542 19543 19544 19545 19546 19547 19548 19549 19550 19551 19552 19553 19554 19555 19556 19557 19558 19559 19560 19561 19562 19563 19564 19565 19566 19567 19568 19569 19570 19571 19572 19573 19574 19575 19576 19577 19578 19579 19580 19581 19582 19583 19584 19585 19586 19587 19588 19589 19590 19591 19592 19593 19594 19595 19596 19597 19598 19599 19600 19601 19602 19603 19604 19605 19606 19607 19608 19609 19610 19611 19612 19613 19614 19615 19616 19617 19618 19619 19620 19621 19622 19623 19624 19625 19626 19627 19628 19629 19630 19631 19632 19633 19634 19635 19636 19637 19638 19639 19640 19641 19642 19643 19644 19645 19646 19647 19648 19649 19650 19651 19652 19653 19654 19655 19656 19657 19658 19659 19660 19661 19662 19663 19664 19665 19666 19667 19668 19669 19670 19671 19672 19673 19674 19675 19676 19677 19678 19679 19680 19681 19682 19683 19684 19685 19686 19687 19688 19689 19690 19691 19692 19693 19694 19695 19696 19697 19698 19699 19700 19701 19702 19703 19704 19705 19706 19707 19708 19709 19710 19711 19712 19713 19714 19715 19716 19717 19718 19719 19720 19721 19722 19723 19724 19725 19726 19727 19728 19729 19730 19731 19732 19733 19734 19735 19736 19737 19738 19739 19740 19741 19742 19743 19744 19745 19746 19747 19748 19749 19750 19751 19752 19753 19754 19755 19756 19757 19758 19759 19760 19761 19762 19763 19764 19765 19766 19767 19768 19769 19770 19771 19772 19773 19774 19775 19776 19777 19778 19779 19780 19781 19782 19783 19784 19785 19786 19787 19788 19789 19790 19791 19792 19793 19794 19795 19796 19797 19798 19799 19800 19801 19802 19803 19804 19805 19806 19807 19808 19809 19810 19811 19812 19813 19814 19815 19816 19817 19818 19819 19820 19821 19822 19823 19824 19825 19826 19827 19828 19829 19830 19831 19832 19833 19834 19835 19836 19837 19838 19839 19840 19841 19842 19843 19844 19845 19846 19847 19848 19849 19850 19851 19852 19853 19854 19855 19856 19857 19858 19859 19860 19861 19862 19863 19864 19865 19866 19867 19868 19869 19870 19871 19872 19873 19874 19875 19876 19877 19878 19879 19880 19881 19882 19883 19884 19885 19886 19887 19888 19889 19890 19891 19892 19893 19894 19895 19896 19897 19898 19899 19900 19901 19902 19903 19904 19905 19906 19907 19908 19909 19910 19911 19912 19913 19914 19915 19916 19917 19918 19919 19920 19921 19922 19923 19924 19925 19926 19927 19928 19929 19930 19931 19932 19933 19934 19935 19936 19937 19938 19939 19940 19941 19942 19943 19944 19945 19946 19947 19948 19949 19950 19951 19952 19953 19954 19955 19956 19957 19958 19959 19960 19961 19962 19963 19964 19965 19966 19967 19968 19969 19970 19971 19972 19973 19974 19975 19976 19977 19978 19979 19980 19981 19982 19983 19984 19985 19986 19987 19988 19989 19990 19991 19992 19993 19994 19995 19996 19997 19998 19999 20000 20001 20002 20003 20004 20005 20006 20007 20008 20009 20010 20011 20012 20013 20014 20015 20016 20017 20018 20019 20020 20021 20022 20023 20024 20025 20026 20027 20028 20029 20030 20031 20032 20033 20034 20035 20036 20037 20038 20039 20040 20041 20042 20043 20044 20045 20046 20047 20048 20049 20050 20051 20052 20053 20054 20055 20056 20057 20058 20059 20060 20061 20062 20063 20064 20065 20066 20067 20068 20069 20070 20071 20072 20073 20074 20075 20076 20077 20078 20079 20080 20081 20082 20083 20084 20085 20086 20087 20088 20089 20090 20091 20092 20093 20094 20095 20096 20097 20098 20099 20100 20101 20102 20103 20104 20105 20106 20107 20108 20109 20110 20111 20112 20113 20114 20115 20116 20117 20118 20119 20120 20121 20122 20123 20124 20125 20126 20127 20128 20129 20130 20131 20132 20133 20134 20135 20136 20137 20138 20139 20140 20141 20142 20143 20144 20145 20146 20147 20148 20149 20150 20151 20152 20153 20154 20155 20156 20157 20158 20159 20160 20161 20162 20163 20164 20165 20166 20167 20168 20169 20170 20171 20172 20173 20174 20175 20176 20177 20178 20179 20180 20181 20182 20183 20184 20185 20186 20187 20188 20189 20190 20191 20192 20193 20194 20195 20196 20197 20198 20199 20200 20201 20202 20203 20204 20205 20206 20207 20208 20209 20210 20211 20212 20213 20214 20215 20216 20217 20218 20219 20220 20221 20222 20223 20224 20225 20226 20227 20228 20229 20230 20231 20232 20233 20234 20235 20236 20237 20238 20239 20240 20241 20242 20243 20244 20245 20246 20247 20248 20249 20250 20251 20252 20253 20254 20255 20256 20257 20258 20259 20260 20261 20262 20263 20264 20265 20266 20267 20268 20269 20270 20271 20272 20273 20274 20275 20276 20277 20278 20279 20280 20281 20282 20283 20284 20285 20286 20287 20288 20289 20290 20291 20292 20293 20294 20295 20296 20297 20298 20299 20300 20301 20302 20303 20304 20305 20306 20307 20308 20309 20310 20311 20312 20313 20314 20315 20316 20317 20318 20319 20320 20321 20322 20323 20324 20325 20326 20327 20328 20329 20330 20331 20332 20333 20334 20335 20336 20337 20338 20339 20340 20341 20342 20343 20344 20345 20346 20347 20348 20349 20350 20351 20352 20353 20354 20355 20356 20357 20358 20359 20360 20361 20362 20363 20364 20365 20366 20367 20368 20369 20370 20371 20372 20373 20374 20375 20376 20377 20378 20379 20380 20381 20382 20383 20384 20385 20386 20387 20388 20389 20390 20391 20392 20393 20394 20395 20396 20397 20398 20399 20400 20401 20402 20403 20404 20405 20406 20407 20408 20409 20410 20411 20412 20413 20414 20415 20416 20417 20418 20419 20420 20421 20422 20423 20424 20425 20426 20427 20428 20429 20430 20431 20432 20433 20434 20435 20436 20437 20438 20439 20440 20441 20442 20443 20444 20445 20446 20447 20448 20449 20450 20451 20452 20453 20454 20455 20456 20457 20458 20459 20460 20461 20462 20463 20464 20465 20466 20467 20468 20469 20470 20471 20472 20473 20474 20475 20476 20477 20478 20479 20480 20481 20482 20483 20484 20485 20486 20487 20488 20489 20490 20491 20492 20493 20494 20495 20496 20497 20498 20499 20500 20501 20502 20503 20504 20505 20506 20507 20508 20509 20510 20511 20512 20513 20514 20515 20516 20517 20518 20519 20520 20521 20522 20523 20524 20525 20526 20527 20528 20529 20530 20531 20532 20533 20534 20535 20536 20537 20538 20539 20540 20541 20542 20543 20544 20545 20546 20547 20548 20549 20550 20551 20552 20553 20554 20555 20556 20557 20558 20559 20560 20561 20562 20563 20564 20565 20566 20567 20568 20569 20570 20571 20572 20573 20574 20575 20576 20577 20578 20579 20580 20581 20582 20583 20584 20585 20586 20587 20588 20589 20590 20591 20592 20593 20594 20595 20596 20597 20598 20599 20600 20601 20602 20603 20604 20605 20606 20607 20608 20609 20610 20611 20612 20613 20614 20615 20616 20617 20618 20619 20620 20621 20622 20623 20624 20625 20626 20627 20628 20629 20630 20631 20632 20633 20634 20635 20636 20637 20638 20639 20640 20641 20642 20643 20644 20645 20646 20647 20648 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 20689 20690 20691 20692 20693 20694 20695 20696 20697 20698 20699 20700 20701 20702 20703 20704 20705 20706 20707 20708 20709 20710 20711 20712 20713 20714 20715 20716 20717 20718 20719 20720 20721 20722 20723 20724 20725 20726 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 20817 20818 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 20841 20842 20843 20844 20845 20846 20847 20848 20849 20850 20851 20852 20853 20854 20855 20856 20857 20858 20859 20860 20861 20862 20863 20864 20865 20866 20867 20868 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 20884 20885 20886 20887 20888 20889 20890 20891 20892 20893 20894 20895 20896 20897 20898 20899 20900 20901 20902 20903 20904 20905 20906 20907 20908 20909 20910 20911 20912 20913 20914 20915 20916 20917 20918 20919 20920 20921 20922 20923 20924 20925 20926 20927 20928 20929 20930 20931 20932 20933 20934 20935 20936 20937 20938 20939 20940 20941 20942 20943 20944 20945 20946 20947 20948 20949 20950 20951 20952 20953 20954 20955 20956 20957 20958 20959 20960 20961 20962 20963 20964 20965 20966 20967 20968 20969 20970 20971 20972 20973 20974 20975 20976 20977 20978 20979 20980 20981 20982 20983 20984 20985 20986 20987 20988 20989 20990 20991 20992 20993 20994 20995 20996 20997 20998 20999 21000 21001 21002 21003 21004 21005 21006 21007 21008 21009 21010 21011 21012 21013 21014 21015 21016 21017 21018 21019 21020 21021 21022 21023 21024 21025 21026 21027 21028 21029 21030 21031 21032 21033 21034 21035 21036 21037 21038 21039 21040 21041 21042 21043 21044 21045 21046 21047 21048 21049 21050 21051 21052 21053 21054 21055 21056 21057 21058 21059 21060 21061 21062 21063 21064 21065 21066 21067 21068 21069 21070 21071 21072 21073 21074 21075 21076 21077 21078 21079 21080 21081 21082 21083 21084 21085 21086 21087 21088 21089 21090 21091 21092 21093 21094 21095 21096 21097 21098 21099 21100 21101 21102 21103 21104 21105 21106 21107 21108 21109 21110 21111 21112 21113 21114 21115 21116 21117 21118 21119 21120 21121 21122 21123 21124 21125 21126 21127 21128 21129 21130 21131 21132 21133 21134 21135 21136 21137 21138 21139 21140 21141 21142 21143 21144 21145 21146 21147 21148 21149 21150 21151 21152 21153 21154 21155 21156 21157 21158 21159 21160 21161 21162 21163 21164 21165 21166 21167 21168 21169 21170 21171 21172 21173 21174 21175 21176 21177 21178 21179 21180 21181 21182 21183 21184 21185 21186 21187 21188 21189 21190 21191 21192 21193 21194 21195 21196 21197 21198 21199 21200 21201 21202 21203 21204 21205 21206 21207 21208 21209 21210 21211 21212 21213 21214 21215 21216 21217 21218 21219 21220 21221 21222 21223 21224 21225 21226 21227 21228 21229 21230 21231 21232 21233 21234 21235 21236 21237 21238 21239 21240 21241 21242 21243 21244 21245 21246 21247 21248 21249 21250 21251 21252 21253 21254 21255 21256 21257 21258 21259 21260 21261 21262 21263 21264 21265 21266 21267 21268 21269 21270 21271 21272 21273 21274 21275 21276 21277 21278 21279 21280 21281 21282 21283 21284 21285 21286 21287 21288 21289 21290 21291 21292 21293 21294 21295 21296 21297 21298 21299 21300 21301 21302 21303 21304 21305 21306 21307 21308 21309 21310 21311 21312 21313 21314 21315 21316 21317 21318 21319 21320 21321 21322 21323 21324 21325 21326 21327 21328 21329 21330 21331 21332 21333 21334 21335 21336 21337 21338 21339 21340 21341 21342 21343 21344 21345 21346 21347 21348 21349 21350 21351 21352 21353 21354 21355 21356 21357 21358 21359 21360 21361 21362 21363 21364 21365 21366 21367 21368 21369 21370 21371 21372 21373 21374 21375 21376 21377 21378 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 21398 21399 21400 21401 21402 21403 21404 21405 21406 21407 21408 21409 21410 21411 21412 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21424 21425 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 21439 21440 21441 21442 21443 21444 21445 21446 21447 21448 21449 21450 21451 21452 21453 21454 21455 21456 21457 21458 21459 21460 21461 21462 21463 21464 21465 21466 21467 21468 21469 21470 21471 21472 21473 21474 21475 21476 21477 21478 21479 21480 21481 21482 21483 21484 21485 21486 21487 21488 21489 21490 21491 21492 21493 21494 21495 21496 21497 21498 21499 21500 21501 21502 21503 21504 21505 21506 21507 21508 21509 21510 21511 21512 21513 21514 21515 21516 21517 21518 21519 21520 21521 21522 21523 21524 21525 21526 21527 21528 21529 21530 21531 21532 21533 21534 21535 21536 21537 21538 21539 21540 21541 21542 21543 21544 21545 21546 21547 21548 21549 21550 21551 21552 21553 21554 21555 21556 21557 21558 21559 21560 21561 21562 21563 21564 21565 21566 21567 21568 21569 21570 21571 21572 21573 21574 21575 21576 21577 21578 21579 21580 21581 21582 21583 21584 21585 21586 21587 21588 21589 21590 21591 21592 21593 21594 21595 21596 21597 21598 21599 21600 21601 21602 21603 21604 21605 21606 21607 21608 21609 21610 21611 21612 21613 21614 21615 21616 21617 21618 21619 21620 21621 21622 21623 21624 21625 21626 21627 21628 21629 21630 21631 21632 21633 21634 21635 21636 21637 21638 21639 21640 21641 21642 21643 21644 21645 21646 21647 21648 21649 21650 21651 21652 21653 21654 21655 21656 21657 21658 21659 21660 21661 21662 21663 21664 21665 21666 21667 21668 21669 21670 21671 21672 21673 21674 21675 21676 21677 21678 21679 21680 21681 21682 21683 21684 21685 21686 21687 21688 21689 21690 21691 21692 21693 21694 21695 21696 21697 21698 21699 21700 21701 21702 21703 21704 21705 21706 21707 21708 21709 21710 21711 21712 21713 21714 21715 21716 21717 21718 21719 21720 21721 21722 21723 21724 21725 21726 21727 21728 21729 21730 21731 21732 21733 21734 21735 21736 21737 21738 21739 21740 21741 21742 21743 21744 21745 21746 21747 21748 21749 21750 21751 21752 21753 21754 21755 21756 21757 21758 21759 21760 21761 21762 21763 21764 21765 21766 21767 21768 21769 21770 21771 21772 21773 21774 21775 21776 21777 21778 21779 21780 21781 21782 21783 21784 21785 21786 21787 21788 21789 21790 21791 21792 21793 21794 21795 21796 21797 21798 21799 21800 21801 21802 21803 21804 21805 21806 21807 21808 21809 21810 21811 21812 21813 21814 21815 21816 21817 21818 21819 21820 21821 21822 21823 21824 21825 21826 21827 21828 21829 21830 21831 21832 21833 21834 21835 21836 21837 21838 21839 21840 21841 21842 21843 21844 21845 21846 21847 21848 21849 21850 21851 21852 21853 21854 21855 21856 21857 21858 21859 21860 21861 21862 21863 21864 21865 21866 21867 21868 21869 21870 21871 21872 21873 21874 21875 21876 21877 21878 21879 21880 21881 21882 21883 21884 21885 21886 21887 21888 21889 21890 21891 21892 21893 21894 21895 21896 21897 21898 21899 21900 21901 21902 21903 21904 21905 21906 21907 21908 21909 21910 21911 21912 21913 21914
|
# Generate automatically. Do not edit.
commit 90dba4ded391c6232a78ee14db0da76efda7b1c3
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2025-09-22
Release 0.25.10
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 3 +++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
commit 152f87e297e9c05858bd4b0b0829784f5f0a76d8
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-19
ci: Install rsync on the base image
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a98c55d808483dd76b16120fb3353bb3dc80c451
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-19
ci: Install gtk-doc, libxslt, and xmlto on the base image
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b45e7e8f90766c8e7a90bb74b378b2787df2dade
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2025-09-18
Release 0.25.9
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 3 +++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
commit 006e627ee95f1fce85c9825c8a0664adb1400e30
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-18
subprojects/pkcs11-json: Update git submodule
Signed-off-by: Daiki Ueno <ueno@gnu.org>
subprojects/pkcs11-json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2ee61264fa004e65176adf601c0bacc355d8b63b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-13
Release 0.25.8
Signed-off-by: Daiki Ueno <ueno@gnu.org>
NEWS | 3 +++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
commit e7b760a54c07a727aab3e5b1b3e5d889d5cb9b24
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-13
Revert "rpc: Correctly map Mozilla certificate distrust attributes"
This reverts commit 5a8430413c88e9ee34feebe98566ab35c0a1bb96, which
broke RPC compatibility with the existing servers. Ideally, this should
be conditionalized by the negotiated protocol version, though that
wouldn't be straightforward as this is a low level function.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-message.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
commit 40dfd50395ef4a1d5cd3d12a5ccc2a76bec6452c
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-10
Release 0.25.7
Signed-off-by: Daiki Ueno <ueno@gnu.org>
NEWS | 3 +++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
commit e90800d8c718b4ada7c8e1a0039c8f9069345291
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-10
.gitignore: Ignore more files
gettext 0.23.1 updates po/boldquot.sed and po/quot.sed, as well as
introduces po/insert-header.sed. Also, the common/test-init.sh file is
generated by configure from common/test-init.sh.in.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitignore | 3 +++
po/boldquot.sed | 11 +++++++++++
po/quot.sed | 11 +++++++++++
3 files changed, 25 insertions(+)
commit 93ba10fd8c7764dd253105c9ae927dcaae406843
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-09
meson: Resurrect systemd unit files installation
The commit cd761134869d1350fb7b7d477947cf83a33133de mistakenly removed
the setting of with_systemd, resulting in the systemd unit files being
not installed on the system.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
meson.build | 1 +
1 file changed, 1 insertion(+)
commit c10a602f925352a1641817f74ef6baedb007a8e8
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-09
autotools: Distribute zsh-completion subdir
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4f8213725ff45d1c69956a55d3f047b6c711d4a2
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-09
Release 0.25.6
Signed-off-by: Daiki Ueno <ueno@gnu.org>
NEWS | 15 +++++++++++++++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 19 insertions(+), 4 deletions(-)
commit 49ed354b4b7100acc4cf081916d91007d85b5beb
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-09
test: Make test-server run as root
The test uses a custom user module, which is ignored if run as root,
unless p11_conf_force_user_config is set.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-server.c | 4 ++++
1 file changed, 4 insertions(+)
commit afcc8c97165107983c92fec56014d2c284ef1c46
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: 2025-05-25
dist: Distribute generated headers.
This means users of the source distribution do not need to use Python
to have these generated at build time.
* p11-kit/Makefile.am (EXTRA_DIST): Register $(VIRTUAL_GENERATED) and
$(PROXY_GENERATED) files.
Fixes: #666
p11-kit/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
commit 7228b611f2211f3c1b8378860467072a6faddda8
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-05
test: Improve coverage in test_get_wrap_template
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-mock.c | 3 +++
1 file changed, 3 insertions(+)
commit 5a8430413c88e9ee34feebe98566ab35c0a1bb96
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-04
rpc: Correctly map Mozilla certificate distrust attributes
The attributes used for expressing certificate distrust in NSS were
incorrectly mapped to a byte array.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-message.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
commit 1559211a67719c456fec46a245d4d4614f28a450
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-05
rpc: Add module configuration option to specify server address
This adds "server-address" option to the module configuration, which
would be useful when connecting to p11-kit-server running as a system
service. The option has a higher precedence over any other
alternatives, the P11_KIT_SERVER_ADDRESS envvar, or
the default $XDG_RUNTIME_DIR/pkcs11.
For this to work, p11-kit-client.so exposes a vendor interface through
C_GetInterface. This interface is hidden from the list obtained from
C_GetInterfaceList.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/pkcs11.conf.xml | 7 +++++
p11-kit/client.c | 48 ++++++++++++++++++++++++++++++---
p11-kit/client.h | 11 ++++++++
p11-kit/modules.c | 39 ++++++++++++++++++++++++---
p11-kit/test-server.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 163 insertions(+), 8 deletions(-)
commit bb8d9aa857ba03e1606001ce8a49dbbb16ecfee3
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-08
ci: Install sccache and gcovr on the base image
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 168127cfc2036f817b92a3a82399522bf76329f4
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-08
ci: cppcheck: Use compilation database generated with meson
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/actions/basic-meson/action.yaml | 4 +++-
.github/workflows/test.yaml | 7 +++++--
common/compat.h | 4 +++-
p11-kit/test-transport-base.c | 1 +
trust/frob-nss-trust.c | 2 ++
trust/test-module.c | 1 +
6 files changed, 15 insertions(+), 4 deletions(-)
commit 220353e1144eb9567086d854534d08fe4be6280f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-05
ci: Supply AddressSanitizer suppression file
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/actions/basic-meson/action.yaml | 2 +-
build/lsan.supp | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit a8793c9968602a82aebcd7be3081744995b739b9
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-09-03
rpc: Fix empty array attribute handling
When an empty array attribute is exchanged at the RPC level, the
client previously sent the number of elements (= 0) even if it's
empty, while the server doesn't expect it. This fixes the client to
not send it.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-message.c | 2 +-
p11-kit/test-mock.c | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
commit 6124cb00da954b9bfec87c8675b114841be1112d
Author: filmsi <miles@filmsi.net>
Date: 2025-08-18
Update sl.po
Updated Slovenian translation as they do not get updated from transifex.
po/sl.po | 1222 +++++++++++++++++++++++++++++++++++++++++---------------------
1 file changed, 817 insertions(+), 405 deletions(-)
commit c9a7741c687daa815596be17f49a9294a8573ba5
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-08-12
ci: Do not pull in weak dependencies
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 9e2ac451e1e063c9a306e6dd28ae027b20954618
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-08-05
ci: Assume DNF5
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit bed8eb3ab403be9c60ed0b31cdf8c2b17b6f3bcb
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-08-05
ci: Specify the container registry
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4c77c549af8d4c37b1cf190337b2e9497fbbda73
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-08-05
Update CI image to Fedora 42
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 01408e2651e2e31232b6c9f170fd66f502aba28e
Author: ArtSin <artsin666@gmail.com>
Date: 2025-08-02
Fix running of test teardown on failure
The variable `setup` is set to 1 between `setjmp` and call to `longjmp` in
`p11_test_fail`, so its value is indeterminate upon the second return from
`setjmp`. If the variable is stored in a register, `setjmp` resets it to the
value before the call (0), and the teardown function is not executed. Fix
by making the variable `volatile`.
This bug can be observed, for example, by modifying `test-argv` to fail and
building with LeakSanitizer and optimizations.
common/test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1bbd6db36b68cae074b35845c212c7d9a8ba19fe
Author: Chan Lee <Leetimemp@gmail.com>
Date: 2025-03-28
gen-wrappers.py: Use `with` statement to ensure file contents are written
p11-kit/gen-wrappers.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
commit dfce3caa2159f1515368e8eb34f329a13c39db75
Author: Chan Lee <Leetimemp@gmail.com>
Date: 2025-03-28
gen-fixed-closures.py: Use `with` statement to ensure file contents are written
p11-kit/gen-fixed-closures.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit cd761134869d1350fb7b7d477947cf83a33133de
Author: Daiki Ueno <ueno@gnu.org>
Date: 2025-04-30
server: Remove libsystemd dependency for socket activation
While libsystemd provides rich facilities to interact with systemd,
the server uses it only for socket activation, which is now also
supported by other service managers. This avoids the dependency by
embedding the minimal implementation of socket activation.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
configure.ac | 3 --
meson.build | 7 +----
p11-kit/meson.build | 4 +--
p11-kit/server.c | 90 +++++++++++++++++++++++++++++++++++++++++++----------
4 files changed, 77 insertions(+), 27 deletions(-)
commit ecd31126164444851a1cfcd2e31071f063424d51
Author: Zhang Maiyun <me@maiyun.me>
Date: 2025-04-19
Add justification for omitting NEED_READPASSPHRASE
configure.ac | 3 +++
1 file changed, 3 insertions(+)
commit 9741f81e235bc5e11d6ff66fcc2fcd72cd24da4d
Author: Zhang Maiyun <me@maiyun.me>
Date: 2025-04-17
Fix definition of NEED_READPASSPHRASE on non-unix
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit a51fa0b3f9c0e888d9be9675634b312ee6a7b769
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2025-01-30
Update pkcs11.h to version 3.1
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/constants.c | 314 +++++
common/pkcs11.h | 3112 ++++++++++++++++++++++++++++++++++---------------
p11-kit/test-mock.c | 2 +-
p11-kit/test-proxy3.c | 1 -
4 files changed, 2515 insertions(+), 914 deletions(-)
commit c97e6f68bf432538eb07f50e719228f7d72fca05
Author: dura <dev@duradsl.duckdns.org>
Date: 2025-04-04
Avoid segfault if p11_library_init_impl/p11_library_uninit are called multiple times
common/library.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 33a55b50282252b768615d818cb69dc3903b7c90
Author: Ronan Pigott <ronan@rjp.ie>
Date: 2025-03-03
Add zsh-completions
Adds some basic zsh completions for p11-kit, and some more comprehensive
completions for the trust command.
meson.build | 1 +
meson_options.txt | 8 ++++
zsh-completion/meson.build | 11 +++++
zsh-completion/p11-kit.zsh | 27 ++++++++++++
zsh-completion/trust.zsh | 102 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 149 insertions(+)
commit 0313eca147821849620d670b7aace1e9864ba7f5
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2025-02-13
Fix errors when compiling with -std=gnu23
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/export-object.c | 2 +-
trust/x509.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 5c1aea1909820a937bc3852c7d47b9ddc62e363f
Author: Akhmadou <61347685+0SansNom@users.noreply.github.com>
Date: 2024-11-15
Update fr.po
po/fr.po | 469 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 235 insertions(+), 234 deletions(-)
commit d7523b1031938fdd9740757f90e903aa09f5397d
Author: Finn Callies <finn.callies@ibm.com>
Date: 2024-12-11
Add support for CKM_IBM_KYBER
This adds support for the CKM_IBM_KYBER IBM specific mechanism.
Additionally this exploits the rpc_C_DeriveKey rework.
common/attrs.c | 3 +
common/constants.c | 5 ++
common/pkcs11x.h | 46 +++++++++++++
p11-kit/rpc-message.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 20 ++++++
5 files changed, 260 insertions(+)
commit aee856f75e06e451a34cb1fdd6630945c9d1623c
Author: Finn Callies <finn.callies@ibm.com>
Date: 2025-01-13
Add support for CKM_IBM_BTC_DERIVE
This adds support for the CKM_IBM_BTC_DERIVE IBM specific mechanism.
Additionally this exploits the rpc_C_DeriveKey rework.
common/constants.c | 1 +
common/pkcs11x.h | 38 ++++++++++++++
p11-kit/rpc-message.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 20 ++++++++
4 files changed, 196 insertions(+)
commit 6449cfe59b80344c87832c9e38afcb4df3f61c56
Author: Finn Callies <finn.callies@ibm.com>
Date: 2025-01-10
Rework rpc_C_DeriveKey to allow size queries
This adds support to the rpc_C_DeriveKey to send the mechanism parameter
back to the client after the actual call. This is necessary to allow
size queries for potential output fields in the parameter. In this case
the call itself will fail but instead of writing an error response the
client has to get the updated parameter. For this the server will send
the error code along with the parameter back to the client that then can
allocate space for the output fields in the parameter and do the call
again.
Since this will lead to a backwards compatability problem within the RPC
protocol the version is bumped.
configure.ac | 2 +-
meson_options.txt | 2 +-
p11-kit/rpc-client.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++---
p11-kit/rpc-message.c | 94 +++++++++++++++++++++++++++++++++++++-
p11-kit/rpc-message.h | 10 ++++
p11-kit/rpc-server.c | 75 +++++++++++++++++++++++++++++-
6 files changed, 295 insertions(+), 12 deletions(-)
commit e2f514f7c3a8afa7072022fcf0a536ba9214cb1b
Author: Finn Callies <finn.callies@ibm.com>
Date: 2024-12-11
Add support for CKM_IBM_ECDSA_OTHER
This adds support for the CKM_IBM_ECDSA_OTHER IBM specific mechanism.
common/constants.c | 1 +
common/pkcs11x.h | 10 ++++++++++
p11-kit/rpc-message.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 11 +++++++++++
4 files changed, 70 insertions(+)
commit b8bb314d65862775e5b71ef1ed671537710c47be
Author: Finn Callies <finn.callies@ibm.com>
Date: 2024-12-11
Add IBM specific key attributes
This adds support for the following IBM specific attributes:
- CKA_IBM_OPAQUE_REENC
- CKA_IBM_OPAQUE_OLD
- CKA_IBM_DILITHIUM_MODE
- CKA_IBM_CCA_AES_KEY_MODE
common/attrs.c | 1 +
common/constants.c | 4 ++++
common/pkcs11x.h | 14 ++++++++++++++
p11-kit/rpc-message.c | 4 ++++
4 files changed, 23 insertions(+)
commit f42d7256420cee99e4e0a2818ab79dced8245a64
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2025-02-04
Update to v4 of actions/upload-artifact
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.github/workflows/cifuzz.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fd7ad3969f68ea24e54d242a08b089039555f7bb
Author: Brecht Sanders <brecht@sanders.org>
Date: 2024-12-31
avoid using already defined thread_local as variable name
Building p11-kit 0.25.5 with GCC15 on MinGW-w64 failed because `thread_local` is already defined for this platform.
Resolved by changing the variable name from `thread_local` to `threadlocal`.
common/library.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
commit fa9ec0e450ce4d34b8245874121b1086cfa97928
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: 2024-10-11
server: check SHELL if (and only if) neither --sh nor --csh is specified
The previous check was checking if the enums returned by getopt were
non-zero, which they always are, regardless of whether the option has
been specified or not.
Fixes: e7d1c91 ("server: Check SHELL only when neither --sh nor --csh is specified")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
p11-kit/server.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
commit e3460dbd947471f9a466f6dffc55b045f282b643
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: 2024-10-11
rpc: include <limits.h> for definition of ULONG_MAX
Fixes build failure on Solaris 11.4 with gcc 14.2:
../p11-kit/rpc-server.c: In function ‘proto_read_attribute_buffer_array’:
../p11-kit/rpc-server.c:289:46: error: ‘ULONG_MAX’ undeclared (first use in this function)
289 | if ((n_array != 0 && ULONG_MAX / n_array < sizeof (CK_ATTRIBUTE)) ||
| ^~~~~~~~~
../p11-kit/rpc-server.c:64:1: note: ‘ULONG_MAX’ is defined in header ‘<limits.h>’; this is probably fixable by adding ‘#include <limits.h>’
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
p11-kit/rpc-server.c | 1 +
1 file changed, 1 insertion(+)
commit a8b94642dbe6d52aa7a7805fbb60b64c4cfd7245
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-10-03
trust: don't create file names longer then 255
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
trust/save.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
commit 89d3a55f67bd8109b559ba3edda7cbdff554e503
Author: Julien Catalano <j.catalano@kerlink.fr>
Date: 2024-09-11
doc/manual: Fix chapter id collision: proxy/sharing
The chapter id in p11-kit-proxy.xml collides with the one in p11-kit-sharing.xml, which makes the HTML generated page overwriting each other.
This results in duplicate page content for both "Sharing PKCS#11 modules" section and "Proxy Module" section. Both provide content from p11-kit-proxy.xml and make p11-kit-sharing.xml content unavailable to the reader.
Changing the chapter id fixes the issue.
doc/manual/p11-kit-proxy.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit aedf4d9fe1cae452e3a8d44e738b5e2e539a781a
Author: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: 2024-08-28
token: sort paths for reproducible extract
There is no defined order in which readdir will return the entries
of a directory. In practice, order can depend on inode number or
similar. If we run p11-kit on different files systems with similar
directory structure but different inode order the output of extract
can change.
To get a stable and reproducible output, sort the paths returned by
readdir before extracting.
Co-authored-by: Tom Dohrmann <erbse.13@gmx.de>
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
trust/token.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
commit e6c69724b362a05603aa67eee7401d21cba6f568
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-08-04
meson: Set _GNU_SOURCE when checking <locale.h> type and functions
Otherwise neither locale_t, newlocale, nor strerror_l is detected
under -Dc_std=c99.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
meson.build | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
commit 09929154d768645cff1bcd24527fb2bf0c31ea04
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-08-04
meson: Set _GNU_SOURCE when checking reallocarray
Otherwise the function is not detected when compiled with -Dc_std=c99.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 5a79df47f0fdde4dbe551321c091f237bf754367
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-08-04
meson: Set _XOPEN_SOURCE while checking strerror_r
Otherwise it cannot detect either version of strerror_r, when compiled
with -Dc_std=c99.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
meson.build | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
commit 4a173c903463a3d47af8b1bd0aaf17159a8f0b00
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-08-04
p11-kit: Include <p11-kit/p11-kit.h> from <p11-kit/uri.h>
This pulls in CRYPTOKI_GNU definitions moved to <p11-kit/p11-kit.h> in
commit 5332245664f7b82ef190f13894a4a4f4ffb15922.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/uri.h | 1 +
1 file changed, 1 insertion(+)
commit 5332245664f7b82ef190f13894a4a4f4ffb15922
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-08-02
p11-kit: Move CRYPTOKI_GNU definitions to <p11-kit/p11-kit.h>
Previously, the same fallback types are defined in <p11-kit/uri.h> and
<p11-kit/iter.h> if CRYPTOKI_GNU is defined. This moves those to
<p11-kit/p11-kit.h> so they are not redefined.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/iter.h | 10 ----------
p11-kit/p11-kit.h | 18 +++++++++++++++---
p11-kit/uri.h | 11 -----------
3 files changed, 15 insertions(+), 24 deletions(-)
commit 078acddf9185569cab23257cadae86432d2834f4
Author: Xi Ruoyao <xry111@xry111.site>
Date: 2024-07-06
build: Set LC_ALL=C for test suite
Otherwise the error messages may be translated, causing a match failure.
Makefile.am | 4 +++-
p11-kit/meson.build | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
commit 0dd113361057e477f40ff4d8788f3e7e400af5f9
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-07-04
Release 0.25.5
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 5 +++++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
commit fc0ed91facddc95c475ee31afef7400300d12367
Author: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
Date: 2024-07-02
iter: Fix recursive attribute loading
Fixes: https://github.com/p11-glue/p11-kit/issues/641
Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
p11-kit/iter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 694d5cbc89541090664dfb5a43123c123f63b80d
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-07-04
Add include for stdint.h to common/hex.c
Co-authored-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/hex.c | 1 +
1 file changed, 1 insertion(+)
commit 94ef36f5a98d977a4bba69312a413f208b7d4664
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-07-04
Update pkcs11-json submodule
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
subprojects/pkcs11-json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d9449ee55be7adf4666720dd7c1957b44960159b
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-07-01
Release 0.25.4
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 10 ++++++++++
configure.ac | 8 ++++----
meson.build | 8 ++++----
3 files changed, 18 insertions(+), 8 deletions(-)
commit c203931e32040f2ffb41461f3e3a5ebf3829ef63
Author: Rosen Penev <rosenp@gmail.com>
Date: 2024-06-28
fix format warning with 32-bit platforms on musl
musl uses 64-bit time_t, even on 32-bit platforms. Cast to avoid the warning.
p11-kit/server.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit e4cf0375cb70cd0993e3bc5049acf4b495b812c6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-05-07
Add function to check run-time version of the library
This adds p11_kit_check_version function, which can be used to check
the run-time version of p11-kit.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Makefile.am | 1 +
p11-kit/test-version.c | 16 ++++++++++++++--
p11-kit/util.c | 19 +++++++++++++++++++
p11-kit/version.h.in | 2 ++
4 files changed, 36 insertions(+), 2 deletions(-)
commit 652927da18abecedf3ab21728252ec73e8214174
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-04-26
p11-kit: Expose version information through macros
This provides P11_KIT_VERSION_{MAJOR,MINOR,MICRO} from the
<p11-kit/version.h> header, along with a helper macro
P11_KIT_CHECK_VERSION(major, minor, micro) for checking the version
requirement with `#if` directive.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitignore | 1 +
configure.ac | 20 +++++++++----
meson.build | 1 +
p11-kit/Makefile.am | 4 +++
p11-kit/meson.build | 14 +++++++--
p11-kit/test-version.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/version.h.in | 58 +++++++++++++++++++++++++++++++++++++
7 files changed, 169 insertions(+), 7 deletions(-)
commit 8832556a467f65b24d51fda14ea42a42d406c406
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-04-27
common: Make libp11-asn1.a depend on libtasn1
This fixes build on systems where <libtasn1.h> is installed in a
non-standard path.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 99611af151c8934f628a11a93a54410fc237d9e9
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-04-27
ci: Bump GitHub actions requirements
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/build-image.yml | 2 +-
.github/workflows/codeql.yml | 6 +++---
.github/workflows/test.yaml | 22 +++++++++++-----------
3 files changed, 15 insertions(+), 15 deletions(-)
commit aeb0324ffcfb890fb009cfbeb7b531d67cd6c108
Author: Daiki Ueno <ueno@gnu.org>
Date: 2024-04-27
ci: Switch to macos-latest
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/test.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f180636c8f812ccfd9ae149431dab74f734abf5c
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-21
Fix division by zero in proto_read_attribute_buffer_array
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/rpc-server.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1195177e20222774de800bbeafa97e3ef291c72d
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2024-03-12
log: Avoid buffer overflow
There was attempt to fix this in bb3a3cb1, but it fixed only the case
when this value was actually provided by the token. When the token does
not support clock, it would print behind the "" buffer, causing random
constant string to be printed instead of the actual value, for example
utcTime: ../common/attrs
This simplifies the long line for readability and prints additional
information about this value being unsupported by the token.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
p11-kit/log.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 74af78c83e91fb67dce5403a893e6bc133fbc985
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-20
Fix the test badge in README
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit c7f12e2eae087c75891cb734875a61e7456e6811
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-18
rpc: remove length assert in proto_read_attribute_buffer_array
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/rpc-server.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
commit f53bdc2c941aae47d592b0376de9a4bc442ec3d2
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-14
rpc: check value length before reading the value
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/rpc-message.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
commit ebfc19c741c7399c2bd48133d3bdf2c70a7b5b0e
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-07
Add more tests for recursive attributes
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/test-attrs.c | 389 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 382 insertions(+), 7 deletions(-)
commit 6529b540ce16cab9a589004152e3c1d1c05d200f
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-02-19
rpc: add support for recursive attributes
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/attrs.c | 4 +-
common/mock.c | 72 +++++++++++++++++--
common/persist.c | 6 ++
p11-kit/iter.c | 58 ++++++++++++++-
p11-kit/rpc-client.c | 7 +-
p11-kit/rpc-message.c | 193 ++++++++++++++++++++++++++++++++++++--------------
p11-kit/rpc-message.h | 12 +++-
p11-kit/rpc-server.c | 75 ++++++++------------
p11-kit/test-mock.c | 131 ++++++++++++++++++++++++++++++++++
9 files changed, 446 insertions(+), 112 deletions(-)
commit 935e28520b7bf00b4fc9b129e75ef6a7372cee25
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-03-04
Fix some compiler warnings
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/compat.c | 2 +-
p11-kit/rpc-client.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
commit e8abb00776163e1179ca7257d8bb137857b5eeac
Author: S-P Chan <shihping.chan@gmail.com>
Date: 2024-02-22
Fallback if C_GetInterface returns 0x54
Addresses #621
Signed-off-by: S-P Chan <shihping.chan@gmail.com>
p11-kit/modules.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
commit 775640465d460e7be262f375830f2617917ffbbb
Author: Kai Kang <kai.kang@windriver.com>
Date: 2024-01-22
common/meson.build: fix required headers missing failure
It fails occasionally with missing generated header files:
| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory
| 42 | #include "openssl.asn.h"
| | ^~~~~~~~~~~~~~~
| compilation terminated.
According to meson manual page:
https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly
'asn_h_dep' should be a dependency of static_library target 'libp11_asn1'
to make sure that required header files generated before compile
common/asn1.c.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
common/meson.build | 1 +
1 file changed, 1 insertion(+)
commit 90bc380385fe2d0c79d1853c7607607e932aeddd
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-01-10
Fix a bug where eddsa mechanism isnt recognized in generate-keypair
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
doc/manual/p11-kit.xml | 2 +-
p11-kit/generate-keypair.c | 3 +--
p11-kit/test-generate-keypair.sh | 10 +++++-----
3 files changed, 7 insertions(+), 8 deletions(-)
commit 2db1b489d6dcef0530109f30908f16e24c093ba6
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-01-05
Add option to specify CKA_ID in generate-keypair and import-object
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/Makefile.am | 4 ++
common/hex.c | 65 +++++++++++++++++++++++-
common/hex.h | 9 +++-
common/meson.build | 1 +
common/test-hex.c | 114 ++++++++++++++++++++++++++++++++++++++++++
common/test.h | 8 +++
doc/manual/p11-kit.xml | 12 ++++-
p11-kit/generate-keypair.c | 46 +++++++++++++++--
p11-kit/import-object.c | 73 ++++++++++++++++++++++++---
p11-kit/test-import-public.sh | 12 ++---
10 files changed, 322 insertions(+), 22 deletions(-)
commit 3fb878a020ea2a178e03165699a5a592fa99dd50
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2024-01-09
Rename "template" parameters in iter.h
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/iter.c | 38 +++++++++++++++++++-------------------
p11-kit/iter.h | 4 ++--
2 files changed, 21 insertions(+), 21 deletions(-)
commit 304db3551edd35c1eb5e067aee783d1a028a2a88
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-28
p11-kit tool: Support --provider option
This adds --provider option to p11-kit subcommands which loads PKCS#11
modules. The option would be useful for testing a specific module
without installing it on the system.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/p11-kit.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/add-profile.c | 13 ++++++++++
p11-kit/delete-object.c | 13 ++++++++++
p11-kit/delete-profile.c | 13 ++++++++++
p11-kit/export-object.c | 12 +++++++++
p11-kit/generate-keypair.c | 13 ++++++++++
p11-kit/import-object.c | 12 +++++++++
p11-kit/list-mechanisms.c | 13 ++++++++++
p11-kit/list-objects.c | 13 ++++++++++
p11-kit/list-profiles.c | 14 ++++++++++
p11-kit/list-tokens.c | 13 ++++++++++
p11-kit/test-list-tokens.sh | 29 ++++++++++++++++++++-
p11-kit/tool.c | 41 ++++++++++++++++++++++++++++-
p11-kit/tool.h | 3 +++
14 files changed, 263 insertions(+), 2 deletions(-)
commit 84e50bb3331e3a40706e16546b836b7669ec62bd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-30
doc: Make option requirement clear for p11-kit subcommands
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/p11-kit.xml | 114 +++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 96 insertions(+), 18 deletions(-)
commit 6fa1c8708c93cf5148247f0c7a2da3bc06a6f4eb
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-31
doc: Fix DocBook validation errors
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/p11-kit.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
commit 231726f8bd1b0a421226ebe984bbaab9915bbb6d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-28
p11-kit tool: Factor out common logic
This moves the common module loading and iteration logic to
p11-kit/tool.c to avoid code duplication.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/meson.build | 4 +-
p11-kit/Makefile.am | 2 +
p11-kit/add-profile.c | 72 ++++++---------------
p11-kit/delete-object.c | 73 +++++++--------------
p11-kit/delete-profile.c | 72 ++++++---------------
p11-kit/export-object.c | 73 +++++++--------------
p11-kit/generate-keypair.c | 77 +++++++---------------
p11-kit/import-object.c | 76 +++++++---------------
p11-kit/list-mechanisms.c | 53 +++++++--------
p11-kit/list-objects.c | 80 +++++++----------------
p11-kit/list-profiles.c | 73 +++++++--------------
p11-kit/list-tokens.c | 60 +++++++----------
p11-kit/meson.build | 3 +-
p11-kit/tool.c | 158 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/tool.h | 59 +++++++++++++++++
15 files changed, 451 insertions(+), 484 deletions(-)
commit a50af66e4edf800327eaf5ddb8968616aeadbbd6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-28
common: Rename tool.h to options.h
As the interface provided by tool.h is sorely for command-line option
parsing, options.h would be a better name. This also allows
consumers (the p11-kit and trust commands) to factor out shared
utilities under the name of p11-kit/tool.[ch] or trust/tool.[ch].
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/Makefile.am | 2 +-
common/meson.build | 2 +-
common/{tool.c => options.c} | 2 +-
common/{tool.h => options.h} | 6 +++---
p11-kit/add-profile.c | 2 +-
p11-kit/delete-object.c | 2 +-
p11-kit/delete-profile.c | 2 +-
p11-kit/export-object.c | 2 +-
p11-kit/generate-keypair.c | 2 +-
p11-kit/import-object.c | 2 +-
p11-kit/list-mechanisms.c | 2 +-
p11-kit/list-objects.c | 2 +-
p11-kit/list-profiles.c | 2 +-
p11-kit/list-tokens.c | 2 +-
p11-kit/lists.c | 2 +-
p11-kit/p11-kit.c | 2 +-
p11-kit/print-config.c | 2 +-
p11-kit/remote.c | 2 +-
p11-kit/server.c | 2 +-
po/POTFILES.in | 2 +-
subprojects/pkcs11-json | 2 +-
trust/anchor.c | 2 +-
trust/check-format.c | 2 +-
trust/dump.c | 2 +-
trust/extract.c | 2 +-
trust/list.c | 2 +-
trust/trust.c | 2 +-
27 files changed, 29 insertions(+), 29 deletions(-)
commit 81715a26a36599562793f5fe103b6bee1a141fdb
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-23
add missing check for strnstr() to meson build
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 2057776b2d44cbdf144afba7c41c07aa08428bca
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-27
Disable getauxval() on !linux systems for meson build, too
See http://bugs.debian.org/718285
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit a1ea579ee7d70ab51a8684dd146967fc3d8c2762
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-22
Do not use getauxval() on !linux systems
See http://bugs.debian.org/718285
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
common/compat.c | 4 ++--
common/compat.h | 3 ++-
common/frob-getauxval.c | 2 +-
common/path.c | 2 +-
configure.ac | 12 +++++++++++-
p11-kit/conf.c | 2 +-
p11-kit/frob-setuid.c | 2 +-
7 files changed, 19 insertions(+), 8 deletions(-)
commit 59a5a17134fb6622d5e39146e0c9e4d546a663ad
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-26
use libbsd-overlay on GNU/hurd and kfreebsd for meson build
https://bugs.debian.org/995049
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
common/meson.build | 2 +-
meson.build | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
commit ee287e25a1a6c93daf9c39dbb6b548ea61232724
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-17
use libbsd-overlay on GNU/hurd and kfreebsd.
https://bugs.debian.org/995049
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
configure.ac | 9 +++++++++
1 file changed, 9 insertions(+)
commit aa8a52e4037dced85657ac58ffd3fff5b2530347
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2023-12-17
Disable __libc_enable_secure usage on Hurd
__libc_enable_secure is not set as 1 when executing something as sgid
and the differet gid is still part of the user's own groups. See also:
- http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00051.html
- http://lists.gnu.org/archive/html/bug-hurd/2015-07/msg00000.html
Originally contributed to Debian by Pino Toscano <toscano.pino@tiscali.it>
Signed-off-by: Andreas Metzler <ametzler@bebt.de>
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3f6233d70ed81fdbc81b9bff345ea90ec2496b3b
Author: MaxHearnden <maxoscarhearnden@gmail.com>
Date: 2023-11-15
Add the flags required for libtasn1 to libp11-asn1.la
These were not copied when libp11-asn1.la was seperated from
libtrust-data.la as part of d8cc241187775e18de86caf446e9160299e6f157
common/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
commit d49c92c8420db6ee4c88515bdb014f68f4d471d9
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-12-02
import-object: Avoid integer truncation on 32-bit platforms
The build fails when compiling for 32-bit platforms with
-Werror=incompatible-pointer-types:
CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build
setarch i686 -- meson compile -C _build -v
...
../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’:
../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types]
223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen);
| ^~~~~~~~~~~~~~~~~~~~~~~~
| |
| long unsigned int *
Reported by Sam James in:
https://github.com/p11-glue/p11-kit/issues/608
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/import-object.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
commit 58cd1c05e001a4fe250c15f3599e79974bc509e3
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-11-16
Fix issues found by static analysis
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/frob-getprogname.c | 4 ++--
common/test.c | 4 +---
p11-kit/generate-keypair.c | 25 +++++++++----------------
p11-kit/import-object.c | 22 +++++-----------------
p11-kit/lists.c | 1 +
p11-kit/print-config.c | 4 +++-
p11-kit/rpc-client.c | 6 ++++--
p11-kit/test-uri.c | 4 ++--
trust/test-trust.c | 2 +-
9 files changed, 28 insertions(+), 44 deletions(-)
commit 8e46359a68deab9112a1e262d5384986ce87b5d8
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-11-16
Fix usage message in p11-kit list-tokens command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/list-tokens.c | 2 +-
p11-kit/test-list-tokens.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 917e02a3211dabbdea4b079cb598581dce84fda1
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-11-15
Release 0.25.3
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 4 ++++
configure.ac | 4 ++--
meson.build | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
commit b7589ec79305f68b552ebb5cf2e4c6c3aa0703fa
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-11-15
Fix meson build failure in macOS (appleframeworks not found)
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 66f1fc7b8f60693e0947d5a9d38cd0d1bc306baa
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-11-15
rpc: Fix serialization of NULL mechanism pointer
A NULL mechanism pointer is valid for C_*Init functions to cancel the
operation. Since 852ccd8d we encoded it with a CK_MECHANISM_TYPE 0 as
an indicator, though it clashes with CKM_RSA_PKCS_KEY_PAIR_GEN (0).
This patch changes the encoding to use a special value (0xffffffff) to
indicate that and also properly advance the offset when reading.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-client.c | 8 ++++++--
p11-kit/rpc-message.c | 10 ++++++++--
p11-kit/rpc-server.c | 8 +++++++-
p11-kit/test-rpc.c | 27 +++++++++++++++++++++++++++
4 files changed, 48 insertions(+), 5 deletions(-)
commit 66d6b42ef8dd84fcd8e199ac9f23f822f1a058c9
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-31
Release 0.25.2
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 5 +++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
commit 72ed0c2ab27b0ccbeec3ae08054eb674f49abdba
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-27
tests: Run tests using SoftHSM after installation
This makes the unit tests self-contained so all possible code paths
are exercised without optional packages installed. The integration
tests against SoftHSM can still run after installation, through "make
installcheck" or running the scripts manually.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/actions/basic-autotools/action.yaml | 12 +-
.github/actions/basic-meson/action.yaml | 17 +-
Makefile.am | 14 ++
meson_options.txt | 4 +
meson_post_install_test.sh | 15 ++
p11-kit/Makefile.am | 16 +-
.../{softhsm2.module => fourteen.module} | 2 +-
p11-kit/meson.build | 13 +-
p11-kit/mock-module-ep12.c | 203 +++++++++++++++++++++
p11-kit/test-generate-keypair.sh | 77 +++-----
p11-kit/test-import-public.sh | 79 ++------
p11-kit/test-lists.sh | 17 ++
p11-kit/test-softhsm2.sh | 180 ++++++++++++++++++
trust/Makefile.am | 8 +-
trust/meson.build | 19 ++
trust/test-extract.sh | 5 +
trust/test-trust.sh | 0
17 files changed, 552 insertions(+), 129 deletions(-)
commit cdc4720d29466e717aa694a85a7aee86ebb94172
Author: Erdem Meydanli <meydanli@amazon.com>
Date: 2023-10-26
fix: improper comparison
Compare the return value of the readpassphrase function to NULL.
Signed-off-by: Erdem Meydanli <meydanli@amazon.com>
p11-kit/tty.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8e21f76e5e5bd6d647bb56782183227d8829f552
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-26
pkcs11-json: Make regeneration robuster
Previously, when common/pkcs11.h is updated and castxml is not
installed on the system, an empty pkcs11.json is created. This makes
the build process abort in that case.
This also fixes the path of pkcs11.json referred to by
p11-kit/Makefile.am, and only includes necessary files in the
distribution.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Makefile.am | 2 +-
p11-kit/Makefile.am | 20 ++++++++++----------
subprojects/pkcs11-json | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
commit 3ee322327b37d9137f3c2c8a9df267ddc7a44678
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-25
Release 0.25.1
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 13 +++++++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
commit 96a8b145a33f95eae52d7d31d0d7ed1674c68423
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-24
Revise documentation of the object and profile sub-commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
doc/manual/p11-kit.xml | 99 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 65 insertions(+), 34 deletions(-)
commit bd75edd1aeb964b124b1b96e8d5c8cea0db6eacc
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-25
Add --login option to delete-object command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-object.c | 41 +++++++++++++++++++++++++++++++++++++----
1 file changed, 37 insertions(+), 4 deletions(-)
commit 6bacb564458a3bb3b2de5a5dfded809a2e348d6b
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-04
Add command for importing objects into a PKCS#11 token
The import-object command allows users to import certificates or
public keys into a pkcs#11 token by providing a PEM file.
usage: p11-kit import-object --file=<file.pem> [--label=<label>]
[--login] pkcs11:token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 19 +-
p11-kit/Makefile.am | 3 +
p11-kit/import-object.c | 615 ++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 5 +
p11-kit/p11-kit.c | 4 +
p11-kit/test-import-public.sh | 151 +++++++++++
po/POTFILES.in | 1 +
8 files changed, 798 insertions(+), 2 deletions(-)
commit cced2d9a4772cb126974a69354b6a9845105407a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-19
iter: Add option to stop at token with active session
The commit fd7c819eff1de40619ba0231dc8819af76df72a6 introduced a
slight backward incompatibility to the P11KitIter behavior when
iterating with P11_KIT_ITER_WITH_TOKENS: previously it stopped before
opening a token, while now it stops after that.
This adds a compatibility measure so those two are distinguishable
with an explicit flag P11_KIT_ITER_WITH_SESSIONS and a kind
P11_KIT_ITER_KIND_SESSION.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/add-profile.c | 2 +-
p11-kit/delete-profile.c | 2 +-
p11-kit/generate-keypair.c | 2 +-
p11-kit/iter.c | 31 ++++++++++++++++++++++---------
p11-kit/iter.h | 2 ++
p11-kit/list-profiles.c | 2 +-
6 files changed, 28 insertions(+), 13 deletions(-)
commit e5f0be33f5d39ad117e1cb84de5a8ac1ebe75548
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-06
p11-kit commands: Add --login option
Previously those tools determined whether a login is necessary by
checking the presence of "pin-value" query attribute in the URI. It
was too implicit and against modern security practice. This instead
asks users to specify --login option and if no "pin-value" is given,
it tries to read a PIN from the terminal.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/add-profile.c | 32 +++++++++++++++++++---
p11-kit/delete-profile.c | 32 +++++++++++++++++++---
p11-kit/export-object.c | 41 ++++++++++++++++++++++++++---
p11-kit/generate-keypair.c | 34 +++++++++++++++++++++---
p11-kit/list-objects.c | 42 ++++++++++++++++++++++++++---
p11-kit/list-profiles.c | 37 +++++++++++++++++++++++---
p11-kit/test-generate-keypair.sh | 10 +++----
p11-kit/test-objects.sh | 57 +++++++++++++++++++++++++++++++++++++++-
8 files changed, 257 insertions(+), 28 deletions(-)
commit 751118077ae093c33a093a9a0f634406b2e97c13
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-04
p11-kit: Support PIN prompting from tty
This adds support for prompting PIN on the terminal, through the
readpassphrase function borrowed from libbsd.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/Makefile.am | 6 ++
common/compat.h | 21 +++++
common/meson.build | 10 +++
common/readpassphrase.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +
meson.build | 3 +-
p11-kit/Makefile.am | 19 ++---
p11-kit/meson.build | 4 +
p11-kit/pin.c | 2 +-
p11-kit/tty.c | 78 ++++++++++++++++++
p11-kit/tty.h | 48 +++++++++++
11 files changed, 385 insertions(+), 16 deletions(-)
commit 466da61d3ec8a1dbbc7f48eab8efb4d6f56d2a41
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-05
p11-kit commands: Stop calling C_Login manually
This is now done in P11KitIter as needed.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/add-profile.c | 34 +++++++++-------------------------
p11-kit/delete-profile.c | 34 +++++++++-------------------------
p11-kit/generate-keypair.c | 34 +++++++++-------------------------
p11-kit/list-profiles.c | 34 +++++++++-------------------------
4 files changed, 36 insertions(+), 100 deletions(-)
commit fd7c819eff1de40619ba0231dc8819af76df72a6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-05
iter: Plumb PIN retrieval through pin-source
This make P11KitIter use the P11KitPin interface to retrieve PIN if
the "pin-source" attribute is available in the matching URI.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/iter.c | 92 +++++++++++++++++++++++++++++++++++++++++++----------
p11-kit/test-iter.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++------
po/POTFILES.in | 1 +
3 files changed, 159 insertions(+), 26 deletions(-)
commit 605232952fa4b4b9f0d7ac8d79afa97f992136a5
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-04
Add list-tokens into po/POTFILES.in and autocompletion
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
po/POTFILES.in | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit 168fdc2b6a9d5aa82a86b417ddf4bba9ef150e05
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-05
Fix some cppcheck errors
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/compat.c | 15 +++++++++------
p11-kit/rpc-message.c | 6 +++---
p11-kit/test-iter.c | 16 ++++++++--------
p11-kit/test-mock.c | 18 +++++++++---------
4 files changed, 29 insertions(+), 26 deletions(-)
commit 1cfbac317f2029a3a3a1c4cc65c49488efd0cd1e
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-04
Fix CI warnings and errors
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.github/actions/basic-meson/action.yaml | 2 +-
build/cross_file_mingw64.txt | 2 +-
common/test-hash.c | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
commit 1cec78401c814c589f2dd826de8eaf6c599a4608
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-01
ci: Update base image and pull in additional packages
This updates the base image to Fedora 38 from Fedora 34, and install
the p11-kit-devel and softhsm packages, which are needed to test the
p11-kit generate-keypair command.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit fc6d0e281ef3401a619dc1e6f6bbe2751c27b8b1
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-04
p11-kit generate-keypair: Support EdDSA key generation
This adds support for generating EdDSA keys with the p11-kit
generate-keypair command. Aside from that tests are added using
SoftHSM to exercise all the supported algorithms.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/Makefile.am | 2 +
p11-kit/fixtures/package-modules/softhsm2.module | 4 ++
p11-kit/generate-keypair.c | 11 ++-
p11-kit/meson.build | 4 ++
p11-kit/test-generate-keypair.sh | 92 ++++++++++++++++++++++++
p11-kit/test-server.sh | 1 +
6 files changed, 113 insertions(+), 1 deletion(-)
commit e2c932038a2c4384d25d24cd5b249b9c84eb12a6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-01
p11-kit list-tokens: New subcommand
This adds a new subcommand "list-tokens" to the p11-kit command, which
is similar to "list-modules" but only prints tokens. This would make
scripting tasks easier.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/p11-kit.xml | 19 +++++
p11-kit/Makefile.am | 4 +
p11-kit/list-tokens.c | 196 ++++++++++++++++++++++++++++++++++++++++++++
p11-kit/lists.c | 9 +-
p11-kit/meson.build | 5 ++
p11-kit/p11-kit.c | 4 +
p11-kit/test-list-tokens.sh | 82 ++++++++++++++++++
7 files changed, 317 insertions(+), 2 deletions(-)
commit 64e5fe3457b9d69ef8bec6de58de7e8dd5b4f056
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-10-01
lists: Refactor iteration and printing logic of modules and tokens
This splits the logic to iterate over modules and tokens and print the
details into two functions: the iteration and printing of CK_INFO and
CK_TOKEN_INFO structures, so that the printing
function (print_token_info) can be used for `p11-kit list-tokens`.
This also makes slot listing more flexible to allow more than 256
slots.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/lists.c | 204 ++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 133 insertions(+), 71 deletions(-)
commit daabb9f2f6e2443e4ce3155ac75341c924175b50
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-21
Fix meson warnings
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/meson.build | 2 +-
doc/manual/meson.build | 2 +-
meson.build | 14 ++++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
commit 6bb52b48c77758dbe8b09d15e8d79f4578cfda99
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-03
Add more tests for profile commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-profiles.sh | 140 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 135 insertions(+), 5 deletions(-)
commit c507a5d911f17e1c64c9aeca93b8a45410a61d92
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-03
Add/delete-profile should fail if there is no matching token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-profile.c | 89 ++++++++++++++++++++++++++++++++++++-----------
p11-kit/list-profiles.c | 90 +++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 145 insertions(+), 34 deletions(-)
commit aedbab2c0f9b23dcc8780ba0f4b189d9b24532b4
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-10-02
Add CI test for building without ASN.1
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.github/actions/basic-autotools/action.yaml | 6 ++++++
.github/workflows/test.yaml | 27 +++++++++++++++++++++++++++
Makefile.am | 1 +
3 files changed, 34 insertions(+)
commit 1392bfcf4e76de01401f15c29551b9fdfc0263f3
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-22
Add tests for p11-kit profile commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/persist.c | 3 +
p11-kit/Makefile.am | 55 ++--
p11-kit/fixtures/package-modules/thirteen.module | 4 +
p11-kit/meson.build | 13 +-
p11-kit/mock-module-ep11.c | 211 ++++++++++++++++
p11-kit/mock-module-ep9.c | 1 -
p11-kit/test-lists.sh | 17 ++
p11-kit/test-objects.sh | 52 +---
p11-kit/test-profiles.sh | 309 ++++++++++++++++++++++-
trust/Makefile.am | 6 +-
10 files changed, 595 insertions(+), 76 deletions(-)
commit 85a0ac8c67f873771ea7d48e625fbcf044601ae2
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-22
Move persist files to Common subdirectory
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/Makefile.am | 2 ++
common/meson.build | 1 +
{trust => common}/persist.c | 0
{trust => common}/persist.h | 0
{trust => common}/types.h | 0
po/POTFILES.in | 2 +-
trust/Makefile.am | 3 ---
trust/meson.build | 2 --
8 files changed, 4 insertions(+), 6 deletions(-)
commit f7a89e5cfe36f642a3f6004e29fd1160933c8f08
Author: Alexander Sosedkin <asosedkin@redhat.com>
Date: 2023-09-22
list-mechanisms: initial implementation
Resolves: #563
Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 16 +++
p11-kit/Makefile.am | 4 +
p11-kit/list-mechanisms.c | 284 ++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 5 +
p11-kit/p11-kit.c | 4 +
p11-kit/test-list-mechanisms.sh | 65 +++++++++
po/POTFILES.in | 1 +
8 files changed, 380 insertions(+), 1 deletion(-)
commit 7d659c1ac7f6153381af042f8fa26485b208483a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-25
.dir-locals.el: Update indentation settings for C and shell-script
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.dir-locals.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 5b13c85909eef2b38859b7fb5a2abc0e33107280
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-26
Test for nonexistent tokens in p11-kit commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/test-init.sh.in | 4 ++--
p11-kit/test-objects.sh | 35 ++++++++++++++++++++++++++++++++++-
p11-kit/test-profiles.sh | 19 ++++++++++++++++++-
3 files changed, 54 insertions(+), 4 deletions(-)
commit 202c1c143620fea5dfecd5fa721aef7a8656142b
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-22
p11-kit tool: make "no matching object/token" error user friendly
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 5 ++++-
p11-kit/delete-object.c | 5 ++++-
p11-kit/generate-keypair.c | 5 ++++-
3 files changed, 12 insertions(+), 3 deletions(-)
commit 2d697bfa2903d4f11c56b5aa44e6cdf8c040d944
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-22
Don't check for slot == 0 as 0 is a valid slot ID
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 5 -----
p11-kit/generate-keypair.c | 5 -----
2 files changed, 10 deletions(-)
commit 0b280a0e9ca3b2c6b6738f85a944ee57b9179ed0
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-21
export-object: Recover public key from algorithm specific attributes
Some tokens such as SoftHSMv2 omits CKA_PUBLIC_KEY_INFO when it can be
derived from algorithm specific attributes, such as CKA_MODULUS and
CKA_PUBLIC_EXPONENT for RSA. This adds support for it if libtasn1 is
available at compile time.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/oid.h | 3 +
common/pkix.asn | 4 +
p11-kit/Makefile.am | 23 +-
p11-kit/export-object.c | 421 ++++++++++++++++++---
p11-kit/fixtures/package-modules/twelve.module | 4 +
.../fixtures/package-modules/win32/twelve.module | 4 +
p11-kit/meson.build | 13 +-
p11-kit/mock-module-ep10.c | 194 ++++++++++
p11-kit/test-export-public.sh | 90 +++++
p11-kit/test-lists.sh | 17 +
p11-kit/test-objects.sh | 35 +-
11 files changed, 749 insertions(+), 59 deletions(-)
commit d8cc241187775e18de86caf446e9160299e6f157
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-21
build: Move common files for handling ASN.1 to common
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Makefile.am | 1 +
common/Makefile.am | 47 +++++++++++++++++++++++++++++++
{trust => common}/asn1.c | 0
{trust => common}/asn1.h | 0
{trust => common}/basic.asn | 0
common/meson.build | 64 +++++++++++++++++++++++++++++++++++++++++++
{trust => common}/oid.c | 0
{trust => common}/oid.h | 0
{trust => common}/openssl.asn | 0
{trust => common}/pkix.asn | 0
{trust => common}/test-asn1.c | 1 -
{trust => common}/test-oid.c | 0
meson.build | 2 ++
trust/Makefile.am | 32 ++--------------------
trust/meson.build | 27 ++----------------
15 files changed, 119 insertions(+), 55 deletions(-)
commit e8872bfdc4b12735bbc0433a59fc0a7ddfd68bbb
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-21
list-objects: nicer printing of flags
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/list-objects.c | 39 +++++++++++++++++++++++++--------------
p11-kit/mock-module-ep9.c | 4 ++++
p11-kit/test-objects.sh | 16 ++++++++--------
3 files changed, 37 insertions(+), 22 deletions(-)
commit 4d33a6267a8f646ed08ee066afe579036341b8ed
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-21
Add missing copyable and destroyable flags into the constants
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/constants.c | 2 ++
1 file changed, 2 insertions(+)
commit 231878de9d8463b55a935e0c55f5f1108196e665
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-20
Use only token URI as profiles arent storage objects
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-profile.c | 2 +-
p11-kit/list-profiles.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 42e93d7dca2885ba2da3c53daf70845466cf4f94
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-19
delete-object: remove only first match on a token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-object.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
commit f1b7d0ee6c8ecb827164578ef9fba5b667936e97
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-19
delete-profile: match only a single token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-profile.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 691235df5b41c0144a27649627e7a3e7c5bd77bb
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-19
Allow login in list-profiles and delete-profiles commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-profile.c | 2 +-
p11-kit/list-profiles.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 0c51f30b8d00cd79ededf6d1e3f0baf98a924281
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-18
Rework add-profile
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 114 ++++++++++++++++++++++++++++----------------------
1 file changed, 63 insertions(+), 51 deletions(-)
commit 42b1025e67d318cc57aff2d8169e6168ef29a085
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-18
Fix add-profile command to create token objects
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 2 ++
1 file changed, 2 insertions(+)
commit 0a11e88cd61a551bf5ea5028aa0b0de4cd1c7445
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-18
Small error message fixups
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 8 ++++----
p11-kit/delete-object.c | 4 ++--
p11-kit/delete-profile.c | 8 ++++----
p11-kit/export-object.c | 4 ++--
p11-kit/generate-keypair.c | 4 ++--
p11-kit/list-objects.c | 6 +++---
p11-kit/list-profiles.c | 7 +++----
7 files changed, 20 insertions(+), 21 deletions(-)
commit 79fe36c8b2d8880a4fbde4cad0c3781d0f3917c4
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-18
list-modules: Do not embed module-name and module-path in URL
module-name and module-path are query attributes, which are to modify
the default settings (RFC 7512 section 2.4). As p11-kit manages the
default configuration, it shouldn't print them as part of the token
URL. This instead prints the absolute path of each module in a
separate field of the output.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/print.c | 4 +-
p11-kit/Makefile.am | 2 +
p11-kit/lists.c | 33 ++++++++--------
p11-kit/meson.build | 4 ++
p11-kit/test-lists.sh | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 128 insertions(+), 20 deletions(-)
commit 6d0e5564f6ca1d128591d812b094ba16d6e23c2d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-18
tests: Check exit status of p11-kit commands in shell-script tests
As we no longer call `set -e`, exit status of each command invocation
should be checked manually.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-objects.sh | 28 +++++++++++++++++++++-------
p11-kit/test-profiles.sh | 4 +++-
2 files changed, 24 insertions(+), 8 deletions(-)
commit ca5ed350a48013fbd7de32d28ce63a34d9d18276
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-15
Add test for p11-kit generate-keypair command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-objects.sh | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit ef0bfeac6dedfacc80fa97371b727efd0a1a588b
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-04
Add command to generate keypair on a PKCS#11 token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
common/compat.c | 10 +
common/compat.h | 13 +-
doc/manual/p11-kit.xml | 41 ++++
p11-kit/Makefile.am | 3 +
p11-kit/generate-keypair.c | 457 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 5 +-
p11-kit/p11-kit.c | 44 +++--
po/POTFILES.in | 1 +
9 files changed, 549 insertions(+), 27 deletions(-)
commit d85df9e2bd1c3c907e67b5cf276e6b724be933fd
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-11
Prevent printing empty date in list-objects
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/list-objects.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 65b2e473e1922d0faabb4c58830153573907cdcd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-14
tests: Port shell-script tests to using test-init.sh
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-messages.sh | 43 ++++++++------
p11-kit/test-objects.sh | 146 ++++++++++++++++++++++-------------------------
p11-kit/test-profiles.sh | 40 +++++++------
p11-kit/test-server.sh | 122 +++++++++++++++++++--------------------
4 files changed, 176 insertions(+), 175 deletions(-)
commit ef2e9fd46ccd0d7895359f02149657236eb12e7d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-14
build: Move test-init.sh from trust to common
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/meson.build | 17 +++++++++++++++++
{trust => common}/test-init.sh.in | 0
configure.ac | 2 +-
trust/Makefile.am | 4 ++--
trust/test-extract.sh | 7 ++++++-
trust/test-trust.sh | 7 ++++++-
6 files changed, 32 insertions(+), 5 deletions(-)
commit 70b7ee8372fec89e1faea09fd673c3f4c6cb3a1d
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-01
Add test for exporting public key
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/mock-module-ep9.c | 121 ++++++++++++++++++++++++++++------------------
p11-kit/test-objects.sh | 62 +++++++++++++++++-------
2 files changed, 119 insertions(+), 64 deletions(-)
commit a16d77a075a9f9222ff55fac3ccac0a945776898
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-04
x
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/export-object.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
commit d035c8c2f9821abb0731ab4c81e6589da9952c23
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-09-01
Add ability to export public keys into export-object command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/export-object.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
commit e732f987851a024d22d7369895ba7bbb0ae11b14
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-02
proxy: Generate wrappers with script
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitignore | 1 +
p11-kit/Makefile.am | 23 +-
p11-kit/gen-wrappers.py | 32 +-
p11-kit/meson.build | 12 +
p11-kit/proxy.c | 1517 +--------------------------------
p11-kit/templates/proxy-excludes.list | 14 +
p11-kit/templates/proxy-wrappers.py | 100 +++
7 files changed, 175 insertions(+), 1524 deletions(-)
commit 81bed3ddc5c3c740cee93cbb35282f56457e53e4
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-09-02
pkcs11-json: Update git submodule
Signed-off-by: Daiki Ueno <ueno@gnu.org>
subprojects/pkcs11-json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 30c302ac6d7b86e0d294b01aeceeaf052bcb99f6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-31
p11-kit list-objects: Use p11_attrs to access attributes by name
This way we don't need to maintain the order of attributes as a magic
number.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/list-objects.c | 105 ++++++++++++++++++++++++-------------------------
1 file changed, 51 insertions(+), 54 deletions(-)
commit ecdc85302717d0f6f4f3c8d2a569089f9a7eeb52
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-31
p11-kit list-objects: Use p11_buffer to safely allocate memory
This makes use of p11_buffer to safely allocate buffer for attribute
retrieval, taking into account of integer overflow and terminating NUL
byte.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/list-objects.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
commit 11394d91ec05ff63f5f7201bb9c2098d707fe4e4
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-29
Add test for export-object command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/mock.h | 1 +
p11-kit/mock-module-ep9.c | 51 +++++++++++++++++++++++++++++++++++
p11-kit/test-objects.sh | 69 ++++++++++++++++++++++++++++++++++++-----------
3 files changed, 106 insertions(+), 15 deletions(-)
commit 7726337b8b9779ac21d1b842c0cf2dd3f2f38897
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-09
Add command to export objects matching PKCS#11 URI
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 17 ++++
p11-kit/Makefile.am | 2 +
p11-kit/export-object.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 +
po/POTFILES.in | 1 +
7 files changed, 268 insertions(+), 1 deletion(-)
commit b4d4fc4b3dd97dd160e8a8439bb4af25b8cdcff7
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-25
Move pem.h and base64.h to common subdirectory
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/Makefile.am | 2 ++
{trust => common}/base64.c | 0
{trust => common}/base64.h | 0
common/meson.build | 2 ++
{trust => common}/pem.c | 0
{trust => common}/pem.h | 0
trust/Makefile.am | 2 --
trust/meson.build | 2 --
8 files changed, 4 insertions(+), 4 deletions(-)
commit a3549f82c8769f41a7cee8f2198354939e28c05c
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-29
Dont pass NULL to p11_kit_modules_finalize/release
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/add-profile.c | 4 ++--
p11-kit/delete-object.c | 4 ++--
p11-kit/delete-profile.c | 4 ++--
p11-kit/list-objects.c | 4 ++--
p11-kit/list-profiles.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
commit 93f1ccff3c91557ae6c523729e75cef69548c6e1
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-29
Add test for list-objects command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 2 +
p11-kit/meson.build | 4 ++
p11-kit/test-objects.sh | 149 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 155 insertions(+)
commit 602c9040afe136af2b14743b210bea4ab33c30f8
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-29
Print URI for storage objects in list-objects command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/list-objects.c | 120 +++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 112 insertions(+), 8 deletions(-)
commit 585d6af8088a4d40ffc2f2c25c9a840b7e65eede
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-28
Allow all types of URIs to be used in p11-kit commands
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-object.c | 2 +-
p11-kit/delete-profile.c | 2 +-
p11-kit/list-objects.c | 2 +-
p11-kit/list-profiles.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 9ff72077b8baee36c44dcbf0d6286c167c1d898b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-29
Update pkcs11-json submodule
This fixes the issue when running meson setup with "castxml"
installed:
Executing subproject pkcs11-json
pkcs11-json| Project name: pkcs11-json
pkcs11-json| Project version: undefined
pkcs11-json| Program castxml found: YES (/usr/bin/castxml)
subprojects/pkcs11-json/meson.build:6:2: ERROR: Unknown variable "pkcs11_json_input".
Signed-off-by: Daiki Ueno <ueno@gnu.org>
meson.build | 3 ++-
subprojects/pkcs11-json | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
commit 6b7ffded7e20d39de1bb61fbfc4fb4731e9e8d74
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-24
pkcs11-json: Make use of Meson subprojects feature
This moves the pkcs11-json submodule under "subprojects", following
the Meson subprojects convention. This allows the submodule to be
automatically initialized when running meson setup.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitmodules | 2 +-
Makefile.am | 4 ++--
meson.build | 4 +++-
p11-kit/Makefile.am | 16 ++++++++--------
pkcs11-json | 1 -
subprojects/pkcs11-json | 1 +
6 files changed, 15 insertions(+), 13 deletions(-)
commit 92055a93d59d72c0c65baf2e85520a408ae884bf
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-12
virtual: Factor out code generation templates
This makes the code generation script more generic by factoring out
templates into separate files.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.gitignore | 2 +
configure.ac | 2 +-
p11-kit/Makefile.am | 51 +++--
p11-kit/gen-fixed-closures.py | 43 ++++
p11-kit/gen-virtual.py | 363 --------------------------------
p11-kit/gen-wrappers.py | 145 +++++++++++++
p11-kit/meson.build | 54 +++--
p11-kit/templates/base-wrappers.py | 40 ++++
p11-kit/templates/binding-wrappers.py | 29 +++
p11-kit/templates/fixed-wrappers.py | 117 ++++++++++
p11-kit/templates/stack-wrappers.py | 29 +++
p11-kit/templates/virtual-excludes.list | 5 +
p11-kit/virtual.c | 3 +-
13 files changed, 483 insertions(+), 400 deletions(-)
commit b6411d7a62c1d228042ccf663487253eea4cd84b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-14
common: Avoid naming clash on MinGW
The symbol "interface" is defined differently in a header included by
default on MinGW, which prevents the use of it in a function signature
in pkcs11.h. To mitigate that, this renames it to "interface_".
In the source there are more places where "interface" is used, though
it shouldn't be a problem as WIN32_LEAN_AND_MEAN is set in compat.h.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/pkcs11.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 91bec95e9ddbf9ba89dce13513e939bebd92ffce
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-08-02
virtual: Auto-generate boilerplate functions from JSON
To avoid a lot of code repetitions in p11-kit/virtual.c, this
introduces a mechanism to generate those from pkcs11.h, through a JSON
based intermediate data format.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/codeql.yml | 2 +
.github/workflows/test.yaml | 18 +
.gitignore | 2 +-
.gitmodules | 3 +
Makefile.am | 6 +-
configure.ac | 2 +
meson.build | 7 +
p11-kit/Makefile.am | 55 +-
p11-kit/gen-virtual-fixed.sh | 28 -
p11-kit/gen-virtual.py | 363 +++++
p11-kit/meson.build | 38 +-
p11-kit/test-managed.c | 1 -
p11-kit/virtual-fixed.h | 1600 ------------------
p11-kit/virtual.c | 3666 +-----------------------------------------
pkcs11-json | 1 +
15 files changed, 520 insertions(+), 5272 deletions(-)
commit f88faf99b32fb04b6810ae347fecdbfc59ddc825
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-08-01
Add command to delete objects matching PKCS#11 URI
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 16 +++++
p11-kit/Makefile.am | 2 +
p11-kit/delete-object.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 ++
po/POTFILES.in | 1 +
7 files changed, 185 insertions(+), 1 deletion(-)
commit d1d4b0ac316a27c739ff91e6c4153f1154e96e5a
Author: Xi Ruoyao <xry111@xry111.site>
Date: 2023-07-27
Fix probing of C_GetInterface
`p11_dl_symbol (dl, "C_GetInterface")` uses dlsym() to find
C_GetInterface in the loaded pkcs11 module. For legacy (pre-3.0) pkcs11
modules, C_GetInterface is not defined in the module. But according to
the documentation of dlsym():
The search performed by dlsym() is breadth first through the
dependency tree of these shared objects.
So if a pkcs11 module links to libp11-kit.so, the C_GetInterface
implementation in libp11-kit.so itself will be found. This
C_GetInterface will return the metadata of p11-kit-proxy.so, causing
"Refuse to load the p11-kit-proxy.so as a registered module".
To solve the issue, if p11_dl_symbol() returns the C_GetInterface in
libp11-kit.so itself, we should ignore it and continue trying
C_GetFunctionList.
p11-kit/modules.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 4d58e40b49d40ac663c77ec694d9636ab6d99943
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-07-22
list-objects: Print CKA_ID in hexadecimal format
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/hex.c | 4 ++++
common/hex.h | 5 ++++-
p11-kit/list-objects.c | 23 ++++++++++++++++++++++-
3 files changed, 30 insertions(+), 2 deletions(-)
commit bbbbd4ba5c9a411229cf4c6d064231ae3d9f18a1
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-07-22
hex: Factor out hex-encoding logic to a separate file
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/Makefile.am | 1 +
common/hex.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/hex.h | 41 ++++++++++++++++++++++++++++++++++++
common/meson.build | 1 +
p11-kit/lists.c | 28 +-----------------------
5 files changed, 106 insertions(+), 27 deletions(-)
commit d98392beb309570c228090866d77e500bc9e30db
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-07-13
Add command to list objects of a token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
common/constants.c | 11 ++
common/constants.h | 2 +
common/test-constants.c | 1 +
doc/manual/p11-kit.xml | 17 +++
p11-kit/Makefile.am | 2 +
p11-kit/iter.c | 17 +++
p11-kit/iter.h | 1 +
p11-kit/list-objects.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 +
po/POTFILES.in | 1 +
12 files changed, 367 insertions(+), 1 deletion(-)
commit b13629f365f77a633f112c7e02c75b777d378be4
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-07-18
Print URIs for modules and tokens in list-modules command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/lists.c | 39 +++++++++++++++++++++++++++++++++++----
1 file changed, 35 insertions(+), 4 deletions(-)
commit 1db2915466d45b2489120bdcefaf320b1e8e8fdd
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-07-17
Fix the usage text for list-modules command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/lists.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7aa6251bf4ce36d027d53c9c96bb05f90ef7eb5b
Author: Adam Sampson <ats@offog.org>
Date: 2023-07-02
Define _GNU_SOURCE when testing for strerror_r
The Meson check for GNU/XSI strerror_r didn't inherit the project
options that include _GNU_SOURCE (unlike the autoconf version), so the
result didn't match how the code that uses it will be compiled. Add
_GNU_SOURCE explicitly as with the following checks.
Signed-off-by: Adam Sampson <ats@offog.org>
meson.build | 1 +
1 file changed, 1 insertion(+)
commit 3ba2c55dfdc8ff20de369f07f6c57d08718d3add
Author: Adam Sampson <ats@offog.org>
Date: 2023-07-02
Check for GNU strerror_r using the compiler only
The new test that was added to distinguish GNU/XSI strerror_r ran a
compiled program, which doesn't work when cross-compiling. The only
difference at compile time is that the GNU version returns char * and
the XSI version returns int, so detect it by compiling a program that
dereferences the return value.
Signed-off-by: Adam Sampson <ats@offog.org>
configure.ac | 19 +++++++------------
meson.build | 10 +++++-----
2 files changed, 12 insertions(+), 17 deletions(-)
commit 76be1cfbf16277b2d607048c6899e633d4543527
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-29
Add Zoltan Fridrichs OpenPGP key to README.md
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a8cce8bd8065bbf80bd47219f85f0cd9cf27dd0c
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-28
Release 0.25.0
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
NEWS | 22 ++++++++++++++++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 24 insertions(+), 2 deletions(-)
commit f992846c467f272c67dceb566bf13258a9bce054
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-28
Suppress memory test warning
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/test-tests.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 74e7f8278c44d37a085d53b7ef09edff897212a3
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-09
client: Support PKCS#11 3.0
This exports C_GetInterfaceList and C_GetInterface from the client
module.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/client.c | 192 +++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 160 insertions(+), 32 deletions(-)
commit 8d9049b284690cae18c029ee7f7dbc3c3f3b2fe6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-09
proxy: Refactor get_interface_inlock
This adds a minor refactoring to get_interface_inlock:
- CK_RV for the return value instead of int
- Use "goto cleanup" instead of a chain of "if (rv == CKR_OK)"
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/proxy.c | 101 +++++++++++++++++++++++++++++++++-----------------------
1 file changed, 59 insertions(+), 42 deletions(-)
commit ccbe143d523fdbdabe4b163df0ca0a75ef9f3b72
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-22
Handle both XSI and GNU versions of strerror_r
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/compat.c | 61 ++++++++++++++++++++++++++++----------------------------
common/compat.h | 12 ++++-------
common/debug.c | 2 +-
common/message.c | 2 +-
configure.ac | 20 ++++++++++++++++++-
meson.build | 20 ++++++++++++++++++-
6 files changed, 74 insertions(+), 43 deletions(-)
commit 5b7977a37442782e09a7d51adb7f8b0eb8c80ec3
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-26
Fix memory leak inside p11_kit_remote_serve_tokens
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/rpc-server.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
commit ff485b883c753651eb34a7811e2c26ba308733cf
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-27
Allow overwriting files in CI Macos testcase
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.github/workflows/test.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 4d93a4363fdb2f54a84b5405a924b1e2726f07ca
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-27
Suppress ASAN error when running p11tool in test-server.sh
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-server.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
commit 7dbc2687364805ee6c2478fa69ecdfeb89648d61
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-20
Remove travis configuration
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.travis.yml | 35 -----------------------------
.travis/autotools/after_failure.sh | 3 ---
.travis/autotools/after_success.sh | 13 -----------
.travis/autotools/before_install.sh | 9 --------
.travis/autotools/install.sh | 14 ------------
.travis/autotools/script.sh | 44 -------------------------------------
.travis/cppcheck/after_failure.sh | 3 ---
.travis/cppcheck/before_install.sh | 9 --------
.travis/cppcheck/install.sh | 14 ------------
.travis/cppcheck/script.sh | 3 ---
.travis/freebsd/after_failure.sh | 3 ---
.travis/freebsd/before_install.sh | 5 -----
.travis/freebsd/script.sh | 6 -----
.travis/linux/after_failure.sh | 3 ---
.travis/linux/after_success.sh | 11 ----------
.travis/linux/before_install.sh | 11 ----------
.travis/linux/install.sh | 14 ------------
.travis/linux/script.sh | 25 ---------------------
.travis/osx/after_failure.sh | 3 ---
.travis/osx/before_install.sh | 5 -----
.travis/osx/script.sh | 6 -----
21 files changed, 239 deletions(-)
commit 8fbd5da6da944a2f2f7d5c08e7625c3c35dfbfe8
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-20
Install gnutls-utils in CI
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a4cfb7be53e2dec082693609aecb48fe0af8bb20
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-20
Add test for p11-kit-client.so
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-server.sh | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
commit d7c318845405fa7ea33154082b437e4a87ee3699
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-16
Fix bug in base_C_MessageSignFinal
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/virtual.c | 2 ++
1 file changed, 2 insertions(+)
commit cb531a61afc0e3c0f2174fa1bf026e993c76ea89
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-09
Make the proxy_module extension in pkg-config .pc file adaptable
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
configure.ac | 3 +++
p11-kit/meson.build | 2 +-
p11-kit/p11-kit-1.pc.in | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
commit 51ea28418c0bf2a11e2a6f226b77d17b2ba25573
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-08
Tests: add space padding to label in InitToken
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/mock.c | 2 +-
p11-kit/test-filter.c | 8 ++++----
p11-kit/test-mock.c | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
commit b1eebfd6aa63fb98f362bd94b9d07dcefb2b3104
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-08
log_C_InitToken: add support to print space padded strings
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/log.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
commit b2dd8d5c73dab8e0f074b32d7bb393817964fb1d
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-01
RPC: add C_InitToken2 that uses space padded label
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
configure.ac | 2 +-
meson_options.txt | 2 +-
p11-kit/rpc-client.c | 47 +++++++++++++++++++++++++++++++++++------
p11-kit/rpc-message.h | 4 ++++
p11-kit/rpc-server.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 103 insertions(+), 10 deletions(-)
commit 84869381c80ecb258ffdabf214faac71eb584577
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-01
Fix hard-coded TRUST_SO path in trust/frob-multi-init.c
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
trust/frob-multi-init.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 98a114703e665520bb439919faaac4cdb0b39d03
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-01
Set stdin and stdout to binary mode on Windows
Co-authored-by: bhuztez <bhuztez@gmail.com>
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/remote.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 1d248b48648aca649fb33c877fa0623b75ce459f
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-06-01
Small format fix in p11-kit/modules.c
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/modules.c | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
commit 71dcd6735c4154ca9dfb18c52405e5f611276e0e
Author: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
Date: 2022-11-07
Add in the ability to dynamically adjust module and configuration paths at run-time via system environmental exports
Background: While trying to integrate PKCS11+HSM into a build system (Yocto Project), we wanted the build system to be able to use the HSM directly. However, The Yocto Project creates a sandboxed environment for each package which uses p11-kit during compilation. This means that the p11-kit modules and configurations cannot be found from within these sandboxed directories, as their paths are non-determinable at compile time. OpenSSL appears to use OPENSSL_CONF for this sort of dynamic configuration, so I've followed their lead and incorporated a similar p11_kit_getenv() method.
configure.ac | 9 +++++++++
meson.build | 5 +++++
meson_options.txt | 4 ++++
p11-kit/modules.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 64 insertions(+), 2 deletions(-)
commit 8a305a06a2fee8ab4f04c97ed56031d196b45e35
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-05-31
print: New interface p11_list_printer
This introduces a new type p11_list_printer, which abstracts a
pretty-printer for nested key value pairs. It maintains the context
of the current printing operation, including indentation and header
colors, so we don't need to spell out the actual presentation
in the call sites.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/print.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++--------
common/print.h | 47 +++++++++++++++---------
p11-kit/lists.c | 53 ++++++++++++++++-----------
trust/list.c | 19 +++++-----
4 files changed, 170 insertions(+), 58 deletions(-)
commit 1b14bfa49c1da1f6c6037e6c60f92a76d92a2464
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-05-24
Add colors to p11-kit command-line tools
- adds URL highlighting to trust list command
- adds colors to trust list command
- adds colors to p11-kit list-modules command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/Makefile.am | 1 +
common/meson.build | 1 +
common/print.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++
common/print.h | 77 ++++++++++++++++++++++++++++++++++++
p11-kit/lists.c | 41 +++++++++----------
trust/check-format.c | 16 +++-----
trust/list.c | 18 +++++----
7 files changed, 222 insertions(+), 41 deletions(-)
commit 2fbe188c53737715fbda9d0e595141b67338cc24
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-05-07
Add command to add profiles to a token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 16 +++
p11-kit/Makefile.am | 2 +
p11-kit/add-profile.c | 259 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 +
po/POTFILES.in | 1 +
7 files changed, 284 insertions(+), 1 deletion(-)
commit 6be43acfeb4a1dffdbb134e1a1c869437c4189d5
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-05-23
Fix profile argument parsing in delete-profile
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/delete-profile.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
commit 51399b7e80223a9f3921d713fd1c6626f34adbbc
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-05-23
Test p11_constant_profiles
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/test-constants.c | 1 +
1 file changed, 1 insertion(+)
commit 6f6c04d6607d4cd5dd0eb0677a36a55ff6131b4e
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-05-07
libffi: Fix handling of pulCount parameter of C_GetInterfaceList
When C_GetInterfaceList is called with NULL pInterfaceList, It doesn't
make any sense to check the content of pulCount.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/virtual.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit e5a62d894647a21a9a93fc82c2daa64f5b22e4a4
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-05-04
Add command to delete profiles from a token
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
doc/manual/p11-kit.xml | 17 ++++
p11-kit/Makefile.am | 2 +
p11-kit/delete-profile.c | 211 +++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 +
po/POTFILES.in | 1 +
7 files changed, 237 insertions(+), 1 deletion(-)
commit 60a917f2192bcbdac7786a9db1845ec579e71df0
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-04-27
Test the p11-kit list-profiles command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
.gitignore | 1 +
p11-kit/Makefile.am | 31 ++++++++++++-
p11-kit/fixtures/package-modules/eleven.module | 4 ++
p11-kit/meson.build | 15 +++++-
p11-kit/mock-module-ep9.c | 63 ++++++++++++++++++++++++++
p11-kit/test-profiles.sh | 30 ++++++++++++
6 files changed, 141 insertions(+), 3 deletions(-)
commit 038b4d8a529863cd48e579b96e4f8a9de1113521
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-04-26
Add command to list token profiles
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
common/constants.c | 10 +++
common/constants.h | 2 +
doc/manual/p11-kit.xml | 17 +++++
p11-kit/Makefile.am | 1 +
p11-kit/list-profiles.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/meson.build | 1 +
p11-kit/p11-kit.c | 4 ++
po/POTFILES.in | 1 +
9 files changed, 213 insertions(+), 1 deletion(-)
commit 3f2c94f872fea556c1f33904d818bfa87acaa61b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-30
meson: Add missing libintl check
On certain non-glibc systems, gettext functions are defined in a
separate library (libintl, typically from GNU gettext). Our autotools
infrastructure has this check, though it was omitted during the
porting to Meson.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/meson.build | 4 ++--
meson.build | 7 +++++++
p11-kit/meson.build | 4 ++--
trust/meson.build | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
commit e2bf7767075c83d948f9585cff4f2fe70d195e30
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-30
.github/workflows: Use meson for macOS build
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/test.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 2eb8bb85e2b1cc50064b0a388df3108805b3f424
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-29
.github/actions: Use wrapper script for build environment setup
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/actions/basic-autotools/action.yaml | 42 +++++------------------------
.github/actions/basic-meson/action.yaml | 32 +++++++++-------------
.github/workflows/test.yaml | 3 +++
build/run-wrapper.sh | 17 ++++++++++++
build/setup-wrapper.sh | 23 ++++++++++++++++
5 files changed, 62 insertions(+), 55 deletions(-)
commit 9474b469311683188e80d3f05ddcb00d413f4283
Author: Clemens Lang <cllang@redhat.com>
Date: 2023-04-17
conf: Remove unused variable
This fixes a warning printed by clang on macOS:
| ../p11-kit/conf.c:411:6: warning: variable 'count' set but not used [-Wunused-but-set-variable]
| int count = 0;
| ^
Signed-off-by: Clemens Lang <cllang@redhat.com>
p11-kit/conf.c | 2 --
1 file changed, 2 deletions(-)
commit 8a4348e8468d08d992cb7d22a4d887d0191383f6
Author: Clemens Lang <cllang@redhat.com>
Date: 2023-04-17
build: Use .so as module suffix on macOS
macOS uses .so as filename extension for loadable modules. For some
reason, meson does not use this by default, but uses .dylib. This
inconsistency between the autoconf build system (which uses .so) and the
meson build system caused the tests to fail, because the mock modules
would not be found by the tests.
This is a bug in meson, as loadable modules (filetype BUNDLE in otool
-hv output) should have an .so extension on macOS. See [1,2] for
discussion in meson.
Port the same fix that was used by the GNOME developers in gtk [3,4] and
glib-networking [5]. See also a similar fix in glib [6].
[1]: https://github.com/mesonbuild/meson/issues/1160
[2]: https://github.com/mesonbuild/meson/issues/3053
[3]: https://gitlab.gnome.org/GNOME/gtk/-/issues/3645
[4]: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3162
[5]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/1
[6]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/280
Signed-off-by: Clemens Lang <cllang@redhat.com>
p11-kit/meson.build | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 2bea671227e8ca1f643871ed5c986cadcd01f7b7
Author: Clemens Lang <cllang@redhat.com>
Date: 2023-04-17
build: Fix linker errors on macOS
This fixes a few linker errors on macOS due to an undefined
p11_library_mutex symbol:
| cc -o p11-kit/p11-kit-server-testable p11-kit/p11-kit-server-testable.p/server.c.o -Wl,-dead_strip_dylibs -Wl,-headerpad_max_install_names -Wl,-undefined,error -Wl,-rpath,/opt/local/lib p11-kit/libp11-kit-testable.a common/libp11-library.a common/libp11-common.a common/libp11-tool.a /opt/local/lib/libffi.dylib
| Undefined symbols for architecture x86_64:
| "_p11_library_mutex", referenced from:
| _p11_kit_be_quiet in libp11-kit-testable.a(util.c.o)
| _p11_kit_be_loud in libp11-kit-testable.a(util.c.o)
| _p11_kit_set_progname in libp11-kit-testable.a(util.c.o)
| ld: symbol(s) not found for architecture x86_64
Fix these by using meson's link_whole feature where required. Note that
instead of declaring a sepearate dependency with link_whole, we could
have used .as_link_whole() on the existing dependency object, but that
would have required bumping the minimum meson version to 0.56. We
decided not to do this for not for compatibility reasons.
Signed-off-by: Clemens Lang <cllang@redhat.com>
common/meson.build | 3 +++
p11-kit/meson.build | 21 ++++++++++++++++++---
trust/meson.build | 24 ++++++++++++++++++++++--
3 files changed, 43 insertions(+), 5 deletions(-)
commit 8c19b2a37569faea62890bd893969b6ae352be7d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-13
.github/workflows/test.yaml: Exercise libffi closure usage
Signed-off-by: Daiki Ueno <dueno@redhat.com>
.github/workflows/test.yaml | 11 +++++++++++
1 file changed, 11 insertions(+)
commit f892ff6845a1150035f6c432c9b3b9f72c1ff663
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-13
virtual: Fix libffi type signatures for PKCS#11 3.0 functions
There were some mismatches between the type signatures of `binding_*`
functions and the `BindingInfo` definitions, causing test failures
when compiled without fixed closures.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/virtual.c | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
commit 2037e70b0a728f4b142906507877b5789368bc7f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-13
build: Allow disabling fixed closures
This allows the user to disable pre-generated closures, by setting the
number of closures to 0 (i.e., `-Dclosures=0` with Meson or
`--with-closures=0` with Autotools).
Signed-off-by: Daiki Ueno <dueno@redhat.com>
configure.ac | 4 ++--
meson.build | 4 ++--
p11-kit/meson.build | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
commit 36709702edf92f9baa9c043f55b2566f8ca2dd01
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
tests: Fix mingw test failures
This updates the module configuration files in the Windows fixture
directory with Unix version.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/Makefile.am | 1 +
.../fixtures/package-modules/win32/four-v3.module | 5 +++++
p11-kit/fixtures/package-modules/win32/four.module | 5 +++--
p11-kit/fixtures/package-modules/win32/six.module | 7 +++++++
.../fixtures/system-modules/two-duplicate.module | 2 +-
p11-kit/fixtures/system-modules/win32/one.module | 1 -
.../system-modules/win32/two-duplicate.module | 2 +-
p11-kit/fixtures/user-modules/win32/one.module | 4 +++-
p11-kit/test-conf.c | 22 +++++++++++-----------
9 files changed, 32 insertions(+), 17 deletions(-)
commit bffe7c2a1531973f649c045b6614b5f76c9259fb
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
.github/actions/basic-meson: Skip test when built with scan-build
Signed-off-by: Daiki Ueno <dueno@redhat.com>
.github/actions/basic-meson/action.yaml | 1 +
1 file changed, 1 insertion(+)
commit 563dcd1462a06a8604bd967058fe4b9bd994cf59
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
.github/workflows/test.yaml: Fix typo in WINEPATH
Signed-off-by: Daiki Ueno <dueno@redhat.com>
.github/workflows/test.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 81ace6551b10f8a00e0e0a48b58109f117de0dba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-11
.github/actions: Don't swallow error exit code when printing logs
This preserves the exit code of the test run, around the log file
inspection.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
.github/actions/basic-autotools/action.yaml | 5 +++++
.github/actions/basic-meson/action.yaml | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
commit 49c1ec46a78e6d7661415e80c182c15a0c8335a6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
build: Pacify clang-analyzer warnings
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/test-compat.c | 6 ++++--
common/test-tests.c | 9 ++++++++-
p11-kit/proxy.c | 2 +-
p11-kit/test-conf.c | 6 ++++--
p11-kit/test-proxy.c | 1 +
trust/digest.c | 4 ++++
trust/index.c | 3 +++
trust/module.c | 4 +++-
trust/test-jks.c | 2 ++
9 files changed, 30 insertions(+), 7 deletions(-)
commit ce32cfdb140275ddc189ee27da426603b89c5485
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
mock: Fix cancel operation with NULL mechanism to C_Message*Init
Previously, when the mechanism parameter was NULL and the
corresponding operation was not active, the code didn't return
immediately and went on with the regular operation, which in turn
resulted in a NULL pointer dereference. Spotted by clang-analyzer.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/mock.c | 74 +++++++++++++++++++++++++++++++----------------------
common/pkcs11.h | 1 +
p11-kit/test-mock.c | 4 +--
3 files changed, 46 insertions(+), 33 deletions(-)
commit 4af2309c265c81d0aee4f20ea9f4f47fd1e175a6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
virtual: Add missing return to binding_C_GetInterface*
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/virtual.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit cbfa5c8c5ac482aab8305fdc76de5d5a0b9969bc
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
tests: Fix memleaks and use reallocarray if possible
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/test-mock.c | 2 ++
p11-kit/test-proxy3.c | 3 ++-
p11-kit/test-virtual.c | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
commit b7b4a96ba23670e6e6b910aef0c1cbd9c26accdb
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
tests: Skip tests using setuid'ed executable under ASan
The test-compat and test-conf tests call out external executables with
a setuid bit set, which doesn't work well under ASan.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/test-compat.c | 12 ++++++++++++
p11-kit/test-conf.c | 12 ++++++++++++
2 files changed, 24 insertions(+)
commit bcd02f71b536effd9116efe2bfe971e6cfb24c35
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-12
trust: Fix memleak in the enumerate command when loading extensions
Signed-off-by: Daiki Ueno <dueno@redhat.com>
trust/enumerate.c | 1 +
1 file changed, 1 insertion(+)
commit 707cc0325232c574ca1d9ed2eeec0f5e01fc5549
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-10-12
pkcs11.h: Add ChaCha20/Salsa20 and Poly1305 mechanisms
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/pkcs11.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
commit 0668d65951407808c349fd9ded9e21a079459068
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-09
trust: Lower Cryptoki version from 3.0 to 2.40
The trust module currently stays at Cryptoki version 2.40, while 3.0
was advertised through the version field in CK_FUNCTION_LIST and
C_GetInfo.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/module.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 161444f36b81425501747e5533026e21b5834001
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-04-11
Add bash-completion for check-format command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/trust | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3680147da31e44900f578b49179bef9ddbf4537e
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-04-11
Add bash-completion for print-config command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
bash-completion/p11-kit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 29c5a123038ff91ed1584de79741b35ed34f659a
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-04-11
Add documentation for print-config command
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
doc/manual/p11-kit.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
commit eb6eeb68da6a48295cd4f68044e83d7111250eec
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-06
compat: Provide stub isatty if it does not exist
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/compat.c | 10 ++++++++++
common/compat.h | 10 ++++++++++
configure.ac | 1 +
meson.build | 1 +
trust/check-format.c | 1 -
5 files changed, 22 insertions(+), 1 deletion(-)
commit d86d022f805165b464d5809019ed4d4a24732c93
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-06
lexer: Keep track of line numbers
This adds the new field "line" to p11_lexer so any errors are printed
with the line numbers where they happen. Also make the header to use
appropriate types for sizes and token types.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
common/lexer.c | 19 +++++++++++++++----
common/lexer.h | 15 ++++++++-------
trust/persist.c | 4 ++++
3 files changed, 27 insertions(+), 11 deletions(-)
commit 1da4600354f0c375cc8352b3ef01f1ad81ee71a0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-04-06
trust: Use the same parser code for parsing and checking
The trust check-format command used a dedicated parsing code for the
.p11-kit format, which behaves differently from the original parsing
code: sometimes it is stricter (e.g., PEM block), while other times it
is not (e.g., constant names and OIDs). This makes it use the same
single parser to align with the original behavior.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
trust/check-format.c | 386 +++++----------------------------------------------
trust/persist.c | 57 ++++++++
trust/persist.h | 7 +
3 files changed, 95 insertions(+), 355 deletions(-)
commit 52f91915a7ec3cacb7921a6f66dfbe304a7f2404
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-02
rpc: Do not use CRYPTOKI_GNU symbols in our code base
These are only defined if CRYPTOKI_GNU is set by the applications.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-message.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
commit 1b58663a2b35f16d3856a370cb4e3cd61f15e1c1
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-04-02
Add AES-GCM mechanism parameters for message-based encryption
When used with C_MessageEncrypt and C_MessageDecrypt, CKM_AES_GCM
takes different parameters than CK_GCM_PARAMS.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/pkcs11.h | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 4 deletions(-)
commit 3b0a772e8b99f5c52417c3e31ed0db5dd092ec22
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-15
Add check-format command to trust tool
The trust check-format command serves to quickly check the validity of .p11-kit files
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
doc/manual/trust.xml | 24 +++
po/POTFILES.in | 1 +
trust/Makefile.am | 1 +
trust/check-format.c | 512 +++++++++++++++++++++++++++++++++++++++++++++++++++
trust/check-format.h | 43 +++++
trust/meson.build | 1 +
trust/trust.c | 2 +
7 files changed, 584 insertions(+)
commit 439c2e84899f7ab4d852ea409b6a39f313b94b0c
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-29
Add test for profile objects
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-iter.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
commit d574df11e2127b38f4527b548974f6ba25918d2c
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-29
Add support for profile objects in mock
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/mock.c | 23 +++++++++++++++++++++++
common/mock.h | 2 ++
common/pkcs11.h | 13 ++++++++++++-
3 files changed, 37 insertions(+), 1 deletion(-)
commit 8b98b0d524c633ba85f9ddcd4c2291c7050f9187
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2023-03-29
server: Fix umask setting when --group is specified
p11-kit server previously set umask(066) unconditionally before chown
and that resulted in removing group read/write bits, even if --group
is specified. This fixes the logic to respect --group and also allows
it to be specified without --user.
Originally reported in:
https://lists.freedesktop.org/archives/p11-glue/2023-January/000725.html
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/server.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 66e8c9edcf57f84e27d302e127a59dfaa662fad5
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-21
Add pkcs#11 3.0 tests to transport tests
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 6 +
p11-kit/meson.build | 3 +-
p11-kit/test-transport-base.c | 449 ++++++++++++++++++++++++++++++++++++++++++
p11-kit/test-transport.c | 419 +--------------------------------------
p11-kit/test-transport3.c | 45 +++++
5 files changed, 507 insertions(+), 415 deletions(-)
commit 7470b5616130fccfe18271e7b48c7829ad1012d7
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-22
Separate low-level message handling tests from test-rpc
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 4 +
p11-kit/meson.build | 1 +
p11-kit/test-rpc-message.c | 855 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/test-rpc.c | 656 ----------------------------------
4 files changed, 860 insertions(+), 656 deletions(-)
commit 6fd1eca04dda7bc147d24eeb033b44edd508bacd
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-21
Add pkcs#11 3.0 tests for rpc module
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/fixtures/package-modules/four-v3.module | 2 +-
p11-kit/fixtures/package-modules/four.module | 2 +-
p11-kit/test-rpc.c | 133 ++++++++++++++----------
3 files changed, 79 insertions(+), 58 deletions(-)
commit 577f04fcf0c52b06546aad440ff5c85f76ce6493
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-21
Add pkcs#11 3.0 tests for log module
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 4 +
p11-kit/fixtures/package-modules/four-v3.module | 2 +-
p11-kit/fixtures/package-modules/four.module | 2 +-
p11-kit/meson.build | 1 +
p11-kit/test-log3.c | 115 ++++++++++++++++++++++++
5 files changed, 122 insertions(+), 2 deletions(-)
commit 993d66a4c05db11cab5e6e155953d453825f1143
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-22
Make version parameter of test_mock_add_tests const
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-mock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 47f2df8614ec5b036b9def78110f810081957c20
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-03-18
tests: Make test-managed succeed without libffi
The test_max_session_load test was assuming that the closure
assignment would succeed even if the fixed closures are exhausted,
thanks to the fallback mechanism when libffi is enabled. This
conditionalizes the test with WITH_FFI and do not exceed the limit if
libffi is enabled.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-managed.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
commit 7cf6e71052b78c936dabe10510f23da734a6a9ca
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-17
virtual: workaround -Wundef in <ffi.h> on macOS 12
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/virtual.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit 7b27efbce33c2b1e16f4f5ce2f658edb28b8f2b9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-17
trust: Properly propagate loaded object count
While the caller calculates the sum of loaded objects,
loader_load_path didn't return the correct number of objects when
reading from a directory. Also protect against potential signed
integer overflows when calculating the total.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
trust/token.c | 64 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 46 insertions(+), 18 deletions(-)
commit a0e919ad93cb39b4183457930e36fd9402961b6b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-15
.github/workflows/test.yaml: Switch to using macOS 12 image
Signed-off-by: Daiki Ueno <dueno@redhat.com>
.github/workflows/test.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 324ebf96146c096cc3bb9965fd87cf9d54087ce6
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-16
Add pkcs#11 3.0 tests for proxy module
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 4 +
p11-kit/fixtures/package-modules/four-v3.module | 5 +
p11-kit/fixtures/package-modules/four.module | 4 +-
p11-kit/meson.build | 1 +
p11-kit/test-proxy3.c | 270 ++++++++++++++++++++++++
5 files changed, 282 insertions(+), 2 deletions(-)
commit f99496ac0449d45319818c3ace2d287fd3223d79
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-16
Add test for get_interface pkcs#11 3.0 function to test-virtual
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-virtual.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
commit c70f0d1deb9c685cd87a2faee024545c9724ca48
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-16
Update test-mock to support pkcs#11 3.0 tests
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/test-log.c | 2 +-
p11-kit/test-managed.c | 2 +-
p11-kit/test-mock.c | 652 ++++++++++++++++++++++++++++++++++++++++++++++-
p11-kit/test-proxy.c | 2 +-
p11-kit/test-rpc.c | 2 +-
p11-kit/test-transport.c | 2 +-
6 files changed, 656 insertions(+), 6 deletions(-)
commit c2919ee2a4c1c5231f4e4b43c577b2ec8ba6cda5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-21
mock: Export C_GetInterface{,List} from the module
Also stop using vs_module_defs for the modules, as it is easier to
just declare functions with __declspec(dllexport).
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/Makefile.am | 1 -
p11-kit/meson.build | 9 ++-------
p11-kit/p11-module.def | 2 --
p11-kit/p11-module.map | 2 ++
trust/meson.build | 4 +---
5 files changed, 5 insertions(+), 13 deletions(-)
commit 5ed3ed02678ee14e8870b4df72b69d9d1cf17454
Author: Daiki Ueno <ueno@gnu.org>
Date: 2023-03-18
proxy: Check requested interface version upon GetInterface
Following up the commit 040ab19faaec28203c673599f51815c7d146f929, this
adds a missing check on interface version requested at GetInterface,
and also a NULL check on pVersion. Reported by Zoltán Fridrich.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/proxy.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
commit 80d25c5ec55243f5d74ec109cd8cbe54352ea9a8
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-16
Add pkcs#11 3.0 mock modules for testing
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 17 +++++
p11-kit/meson.build | 3 +
p11-kit/mock-module-v3-ep.c | 138 +++++++++++++++++++++++++++++++++++++++
p11-kit/mock-module-v3-ep2.c | 136 ++++++++++++++++++++++++++++++++++++++
p11-kit/mock-module-v3-ep4.c | 152 +++++++++++++++++++++++++++++++++++++++++++
5 files changed, 446 insertions(+)
commit 54bfa28536d5c05deec675cc0a85a6e1fd4a51bf
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-16
Add PKCS#11 3.0 support to mock module
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/mock.c | 1600 +++++++++++++++++++++++++++++++++++++++++++++++++--------
common/mock.h | 421 ++++++++++++++-
2 files changed, 1809 insertions(+), 212 deletions(-)
commit 7fe7e5d95d9197e7f52aab314468d424acc6ac88
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-09
Add PKCS#11 3.0 support to RPC
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/client.c | 6 +-
p11-kit/rpc-client.c | 398 +++++++++++++++++++++++++++++++++++++++++++++-
p11-kit/rpc-message.h | 46 ++++++
p11-kit/rpc-server.c | 433 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 875 insertions(+), 8 deletions(-)
commit 040ab19faaec28203c673599f51815c7d146f929
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-09
proxy: Simplify interface lookup logic
This plumbs proxy around CK_INTERFACE instead of CK_FUNCTION_LIST.
That way we can eliminate global `interfaces` as well as reduce the
number of wrapped functions created by C_GetInterface.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/proxy.c | 122 +++++++++++++++++++-------------------------------------
1 file changed, 42 insertions(+), 80 deletions(-)
commit bff5c3d29e02573c801cededaef480ef26862b76
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-09
Add PKCS#11 3.0 support to log
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/log.c | 425 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 425 insertions(+)
commit 466a31b960ba690b5f09d0d68604c3ce05e8c71a
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-15
Add PKCS#11 3.0 support to proxy
common/pkcs11i.h | 171 +++++-
doc/manual/p11-kit-proxy.xml | 8 +-
doc/manual/p11-kit-sections.txt | 2 +
p11-kit/Makefile.am | 6 +-
p11-kit/gen-virtual-fixed.sh | 2 +-
p11-kit/libp11-kit-0.dll.def | 2 +
p11-kit/libp11-kit.map | 2 +
p11-kit/modules.c | 45 +-
p11-kit/proxy.c | 668 +++++++++++++++++++++-
p11-kit/test-proxy.c | 8 +-
p11-kit/virtual-fixed.h | 600 +++++++++++++++++---
p11-kit/virtual.c | 1176 ++++++++++++++++++++++++++++++++++++++-
12 files changed, 2558 insertions(+), 132 deletions(-)
commit 095e521285e86900bc161c883c26d38cc1e8166e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-03
README.md: Remove no longer existing LGTM.com badges
Signed-off-by: Daiki Ueno <dueno@redhat.com>
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b5ba02c0a81d793a9119ef42194866d6174a83cd
Author: LGTM Migrator <lgtm-migrator@users.noreply.github.com>
Date: 2022-12-08
Add CodeQL workflow for GitHub code scanning
This is based on the template except that it uses Meson explicitly
instead of the autobuild action.
Modified-by: Daiki Ueno <dueno@redhat.com>
.github/workflows/codeql.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
commit eb183496b913b8cdfb73e6aa35eaad6ccd218388
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2023-03-03
Add mechanism definitions for pkcs#11 3.0
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
common/pkcs11.h | 3 +++
1 file changed, 3 insertions(+)
commit d3d333f9aa037badd360036da3766e9f58a45dbc
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-05-25
pkcs11: Add PKCS#11 3.0 functions and update it to 3.0
The changes are based on the OpenSC's pkcs11.h
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
common/mock.h | 2 +-
common/pkcs11.h | 358 ++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 287 insertions(+), 73 deletions(-)
commit 0492597089e41464d9e8669e20969688618a5be3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2023-03-02
rpc-server: Check pointer value returned by proto_read_byte_array
The commit b58b725f30ea833ce8ff08879f616b32be44cbdb added a case where
proto_read_byte_array may return non-zero length while the pointer
location is set to NULL. This is to accommodate the change in
rpc_C_Initialize.
Spotted by oss-fuzz:
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=56504
Signed-off-by: Daiki Ueno <dueno@redhat.com>
p11-kit/rpc-server.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 8fd7fc528dd83521d5fec7f8261789cac9d65ea8
Author: Clemens Lang <cllang@redhat.com>
Date: 2023-02-01
rpc: Fix two off-by-one errors identified by asan
Reads after the end of the array happen when removing elements as well
as if the last element was removed. Note that the new if is required
because memmove() expects a size_t as length, so we must ensure that it
can not be negative.
The full AddressSanitizer report is:
| =================================================================
| ==27174==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x616000000bb0 at pc 0x00010f8b618d bp 0x7ff7b0b5c3c0 sp 0x7ff7b0b5bb80
| READ of size 560 at 0x616000000bb0 thread T0
| #0 0x10f8b618c in wrap_memcpy+0x16c (libclang_rt.asan_osx_dynamic.dylib:x86_64h+0x1f18c)
| #1 0x111a9bac5 in rpc_C_GetMechanismList+0x18c (p11-kit-client.so:x86_64+0x18ac5)
| #2 0x111823534 in p11prov_GetMechanismList interface.gen.c:138
| #3 0x11184e404 in get_slot_mechanisms session.c:113
| #4 0x11184c3ba in p11prov_init_slots session.c:226
| #5 0x111843fed in p11prov_module_init provider.c:1035
| #6 0x1118417a9 in OSSL_provider_init provider.c:1102
| #7 0x11080ee97 in provider_activate+0x117 (libcrypto.3.dylib:x86_64+0x12be97)
| #8 0x11080eced in ossl_provider_activate+0x42 (libcrypto.3.dylib:x86_64+0x12bced)
| #9 0x11080db4a in provider_conf_init+0x2a2 (libcrypto.3.dylib:x86_64+0x12ab4a)
| #10 0x11075ae36 in CONF_modules_load+0x37b (libcrypto.3.dylib:x86_64+0x77e36)
| #11 0x11075b0c9 in CONF_modules_load_file_ex+0x78 (libcrypto.3.dylib:x86_64+0x780c9)
| #12 0x11075b899 in ossl_config_int+0x36 (libcrypto.3.dylib:x86_64+0x78899)
| #13 0x110806ac9 in ossl_init_config_ossl_+0xa (libcrypto.3.dylib:x86_64+0x123ac9)
| #14 0x7ff818b4acc4 in __pthread_once_handler+0x40 (libsystem_pthread.dylib:x86_64+0x2cc4)
| #15 0x7ff818b61725 in _os_once_callout+0x11 (libsystem_platform.dylib:x86_64+0x1725)
| #16 0x7ff818b4ac72 in pthread_once+0x49 (libsystem_pthread.dylib:x86_64+0x2c72)
| #17 0x11081126c in CRYPTO_THREAD_run_once+0x8 (libcrypto.3.dylib:x86_64+0x12e26c)
| #18 0x11080691d in OPENSSL_init_crypto+0x446 (libcrypto.3.dylib:x86_64+0x12391d)
| #19 0x10f6032dc in OPENSSL_init_ssl+0x79 (libssl.3.dylib:x86_64+0x102dc)
| #20 0x10f3c6287 in main+0x62 (openssl:x86_64+0x100024287)
| #21 0x115f5252d in start+0x1cd (dyld:x86_64+0x552d)
|
| 0x616000000bb0 is located 0 bytes to the right of 560-byte region [0x616000000980,0x616000000bb0)
| allocated by thread T0 here:
| #0 0x10f8e1ed0 in wrap_malloc+0xa0 (libclang_rt.asan_osx_dynamic.dylib:x86_64h+0x4aed0)
| #1 0x111f1432f in CRYPTO_malloc+0x8f (libcrypto.3.dylib:x86_64+0x16332f)
| #2 0x11184e1a8 in get_slot_mechanisms session.c:107
| #3 0x11184c3ba in p11prov_init_slots session.c:226
| #4 0x111843fed in p11prov_module_init provider.c:1035
| #5 0x1118417a9 in OSSL_provider_init provider.c:1102
| #6 0x11080ee97 in provider_activate+0x117 (libcrypto.3.dylib:x86_64+0x12be97)
| #7 0x11080eced in ossl_provider_activate+0x42 (libcrypto.3.dylib:x86_64+0x12bced)
| #8 0x11080db4a in provider_conf_init+0x2a2 (libcrypto.3.dylib:x86_64+0x12ab4a)
| #9 0x11075ae36 in CONF_modules_load+0x37b (libcrypto.3.dylib:x86_64+0x77e36)
| #10 0x11075b0c9 in CONF_modules_load_file_ex+0x78 (libcrypto.3.dylib:x86_64+0x780c9)
| #11 0x11075b899 in ossl_config_int+0x36 (libcrypto.3.dylib:x86_64+0x78899)
| #12 0x110806ac9 in ossl_init_config_ossl_+0xa (libcrypto.3.dylib:x86_64+0x123ac9)
| #13 0x7ff818b4acc4 in __pthread_once_handler+0x40 (libsystem_pthread.dylib:x86_64+0x2cc4)
| #14 0x7ff818b61725 in _os_once_callout+0x11 (libsystem_platform.dylib:x86_64+0x1725)
| #15 0x7ff818b4ac72 in pthread_once+0x49 (libsystem_pthread.dylib:x86_64+0x2c72)
| #16 0x11081126c in CRYPTO_THREAD_run_once+0x8 (libcrypto.3.dylib:x86_64+0x12e26c)
| #17 0x11080691d in OPENSSL_init_crypto+0x446 (libcrypto.3.dylib:x86_64+0x12391d)
| #18 0x10f6032dc in OPENSSL_init_ssl+0x79 (libssl.3.dylib:x86_64+0x102dc)
| #19 0x10f3c6287 in main+0x62 (openssl:x86_64+0x100024287)
| #20 0x115f5252d in start+0x1cd (dyld:x86_64+0x552d)
|
| SUMMARY: AddressSanitizer: heap-buffer-overflow (libclang_rt.asan_osx_dynamic.dylib:x86_64h+0x1f18c) in wrap_memcpy+0x16c
| Shadow bytes around the buggy address:
| 0x1c2c00000120: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
| 0x1c2c00000130: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c00000140: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c00000150: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c00000160: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| =>0x1c2c00000170: 00 00 00 00 00 00[fa]fa fa fa fa fa fa fa fa fa
| 0x1c2c00000180: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
| 0x1c2c00000190: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c000001a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c000001b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| 0x1c2c000001c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
| Shadow byte legend (one shadow byte represents 8 application bytes):
| Addressable: 00
| Partially addressable: 01 02 03 04 05 06 07
| Heap left redzone: fa
| Freed heap region: fd
| Stack left redzone: f1
| Stack mid redzone: f2
| Stack right redzone: f3
| Stack after return: f5
| Stack use after scope: f8
| Global redzone: f9
| Global init order: f6
| Poisoned by user: f7
| Container overflow: fc
| Array cookie: ac
| Intra object redzone: bb
| ASan internal: fe
| Left alloca redzone: ca
| Right alloca redzone: cb
| ==27174==ABORTING
| Abort trap: 6
Signed-off-by: Clemens Lang <cllang@redhat.com>
Modified-by: Daiki Ueno <dueno@redhat.com>
p11-kit/rpc-client.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit b58b725f30ea833ce8ff08879f616b32be44cbdb
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-15
rpc-server: Fix reading NULL byte arrays
The proto_read_byte_array() is used in IN_BYTE_ARRAY. Its client
counterpart is using p11_rpc_message_write_byte_array(), which ads
uint32 item with the array size after 0 byte, but this was never
read here causing message corruption errors.
p11-kit/rpc-server.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit a51ed5d9186d819d13c628c968f2837a1e61796c
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-15
test-mock: Test operations on private objects
p11-kit/test-mock.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
commit 25ac7415a547b1db2baccc143c9a4d2b1cee3c57
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-15
test-mock: Use assert_num_equal for easier debugging
p11-kit/test-mock.c | 280 ++++++++++++++++++++++++++--------------------------
1 file changed, 140 insertions(+), 140 deletions(-)
commit 852ccd8d1cfcd39a478b721de10238086adea425
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-15
Test more use cases of PK operations
This increase test coverage and captures more corner cases of
parameters and return values handling.
Namely:
* NULL mechanism cancels operation, but it was considered here as
bad arguments
* Some queries for buffer sizes were incorrectly finalizing the
operations
* Changed the internal operation identification to use CK_FLAGS as
suggested by specs
* Verify operation was not correcly finalized when the signature was
not valid in mock
* The log and rpc modules were not handling the NULL mech correctly
common/mock.c | 206 +++++++++++++++++++++++++++++++++++++++-----------
p11-kit/log.c | 14 ++--
p11-kit/rpc-client.c | 9 ++-
p11-kit/rpc-message.c | 5 ++
p11-kit/rpc-server.c | 78 +++++++++++--------
p11-kit/test-mock.c | 189 +++++++++++++++++++++++++++++++++++++++++++--
6 files changed, 414 insertions(+), 87 deletions(-)
commit 1afb06e107937478beb97ae90c32a737e7dc85b2
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-05-25
pkcs11: Fix typo in the parameter name
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
common/pkcs11.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ac43f1edd029d0e94bc944eb33342c69a0580cc7
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2021-06-09
test-modules: Remove duplicate test_no_duplicates (just named otherwise)
This was introduced as part of c01b59e (Check exhaustion of fixed
closures ) which looks like it did not test the original issue.
p11-kit/test-modules.c | 36 ------------------------------------
1 file changed, 36 deletions(-)
commit d39043f7c6e44247b5b1a237888e80b2a4d9c2b2
Author: Florian Weimer <fweimer@redhat.com>
Date: 2022-12-12
Fix meson/configure _Thread_local checks for C99 compatibility
The type was missing from the definition, which happens to work
in current compilers for historic reasons. Implicit ints were
actually removed from C in 1999.
configure.ac | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit da081beb2765d55a39f3c8e309b51b590d5efe1f
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2022-12-02
po: Add p11-kit/print-config.c to POTFILES.in
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit a8fad5451241f0df7e2433b8aefdd3f23441b97e
Author: Zoltan Fridrich <zfridric@redhat.com>
Date: 2022-11-28
Add command to print merged configuration
Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-kit/Makefile.am | 4 ++
p11-kit/meson.build | 7 +--
p11-kit/p11-kit.c | 4 ++
p11-kit/print-config.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 149 insertions(+), 3 deletions(-)
commit 5056a43b1360a4e098b71766449af862bfa8f1b3
Author: David Korczynski <david@adalogics.com>
Date: 2022-11-23
ci: Add CIFuzz workflow
.github/workflows/cifuzz.yml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
commit e3b3ced300e53d96a4688bfd682f828c40b9ec81
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-10-30
.github/workflows/test.yaml: Enable CI on macOS
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/actions/basic-autotools/action.yaml | 43 +++++++++++++++++++++++------
.github/workflows/test.yaml | 16 +++++++++++
trust/test-extract.sh | 9 +++---
3 files changed, 55 insertions(+), 13 deletions(-)
commit e7d1c91dc1c618d4c7cab7f8c2a614720f552ed8
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-10-19
server: Check SHELL only when neither --sh nor --csh is specified
Previously C shell syntax is used for printing environment variable
setup even if --sh is given when SHELL is csh.
Reported in:
https://github.com/p11-glue/p11-kit/issues/437
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8c917c0588d728edb665e96bb7b9f8e15b5978dd
Author: Balázs Úr <balazs@urbalazs.hu>
Date: 2022-10-20
po: Fix warning and fatal error in Sinhala translation
po/si.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit c92e95f9799d5716bdbddd06e48ab319cdb484c7
Author: Balázs Úr <balazs@urbalazs.hu>
Date: 2022-10-19
po: Update translations from Transifex
po/LINGUAS | 1 +
po/ar.po | 1106 +++++++++++++++++++++++++++++++++++++++-
po/as.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/ast.po | 1260 ++++++++++++++++++++++++++++++++++++++++++----
po/az.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/bg.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/bn_IN.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/ca.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/ca@valencia.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/cs.po | 1108 ++++++++++++++++++++++++++++++++++++++++-
po/cy.po | 1104 +++++++++++++++++++++++++++++++++++++++-
po/da.po | 1124 ++++++++++++++++++++++++++++++++++++++++-
po/de.po | 1123 ++++++++++++++++++++++++++++++++++++++++-
po/el.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/en_GB.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/eo.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/es.po | 1140 +++++++++++++++++++++++++++++++++++++++++-
po/et.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/eu.po | 1146 ++++++++++++++++++++++++++++++++++++++++--
po/fa.po | 1105 +++++++++++++++++++++++++++++++++++++++-
po/fi.po | 1201 ++++++++++++++++++++++++++++++++++++++++++--
po/fo.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/fr.po | 1107 ++++++++++++++++++++++++++++++++++++++++-
po/fur.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/ga.po | 1105 +++++++++++++++++++++++++++++++++++++++-
po/gl.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/gu.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/he.po | 1104 +++++++++++++++++++++++++++++++++++++++-
po/hi.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/hr.po | 1177 +++++++++++++++++++++++++++++++++++++++++--
po/hu.po | 1201 ++++++++++++++++++++++++++++++++++++++++++--
po/ia.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/id.po | 1120 ++++++++++++++++++++++++++++++++++++++++-
po/it.po | 1107 ++++++++++++++++++++++++++++++++++++++++-
po/ja.po | 1107 ++++++++++++++++++++++++++++++++++++++++-
po/ka.po | 1125 ++++++++++++++++++++++++++++++++++++++++-
po/kk.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/kn.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/ko.po | 1109 ++++++++++++++++++++++++++++++++++++++++-
po/lt.po | 1150 ++++++++++++++++++++++++++++++++++++++++--
po/lv.po | 1107 ++++++++++++++++++++++++++++++++++++++++-
po/ml.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/mr.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/ms.po | 1098 +++++++++++++++++++++++++++++++++++++++-
po/nb.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/nl.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/nn.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/oc.po | 1101 +++++++++++++++++++++++++++++++++++++++-
po/or.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/pa.po | 1128 ++++++++++++++++++++++++++++++++++++++++-
po/pl.po | 1116 ++++++++++++++++++++++++++++++++++++++++-
po/pt.po | 1105 +++++++++++++++++++++++++++++++++++++++-
po/pt_BR.po | 1131 ++++++++++++++++++++++++++++++++++++++++-
po/ro.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/ru.po | 1107 ++++++++++++++++++++++++++++++++++++++++-
po/si.po | 1438 +++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sk.po | 1108 ++++++++++++++++++++++++++++++++++++++++-
po/sl.po | 1106 +++++++++++++++++++++++++++++++++++++++-
po/sq.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/sr.po | 1106 +++++++++++++++++++++++++++++++++++++++-
po/sr@latin.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/sv.po | 1142 +++++++++++++++++++++++++++++++++++++++++-
po/ta.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/te.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/th.po | 1098 +++++++++++++++++++++++++++++++++++++++-
po/tr.po | 1145 ++++++++++++++++++++++++++++++++++++++++--
po/uk.po | 1133 ++++++++++++++++++++++++++++++++++++++++-
po/vi.po | 1098 +++++++++++++++++++++++++++++++++++++++-
po/wa.po | 1099 +++++++++++++++++++++++++++++++++++++++-
po/zh_CN.po | 1103 +++++++++++++++++++++++++++++++++++++++-
po/zh_HK.po | 1102 +++++++++++++++++++++++++++++++++++++++-
po/zh_TW.po | 1260 ++++++++++++++++++++++++++++++++++++++++++----
72 files changed, 78677 insertions(+), 899 deletions(-)
commit 870ef2048aadca2655462b6221b1b305ee53bb08
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-10-18
modules: Make logging message more translatable
Reported and fix suggested by Balázs Úr in:
https://github.com/p11-glue/p11-kit/issues/435
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/modules.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
commit 42aff7709a1f9eafc434e2d994c7283b26d9820f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-08-01
Revert "ci: Switch to using Gcovr instead of LCOV"
This reverts commit 2edebe3b674d364430981771cb402e8a1a412e45.
It turned out that neither Gcovr supports LCOV output format that
Coveralls GH action requires, nor Coveralls GH action supports JSON
format produced by gcovr --coveralls.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2edebe3b674d364430981771cb402e8a1a412e45
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-31
ci: Switch to using Gcovr instead of LCOV
Signed-off-by: Daiki Ueno <ueno@gnu.org>
ci/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7b1ef9e559e7f7bb2c743abed7688b621cda9f88
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-29
trust: Remove condition that always evaluates to true
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/base64.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 6e26a15d832c1bfaa6261c6ebccaa687d61683a6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-29
trust: Make loop invariant more explicit in load_attached_extensions
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/enumerate.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
commit 7b111c0c4babc9697473ff612a601171e373d2e2
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-29
trust: Use fstat/fchmod instead of stat/chmod
This prevents a race condition when the underlying file being changed
in between the calls.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/save.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
commit 1046e0ae686037b7cd3d7e5c9ab447c449d70ba9
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-29
compat: Fix detection of O_BINARY and O_CLOEXEC
Previously those macros were defined as 0 unless <fcntl.h> was
included before "compat.h".
Reported and fix suggested by Kevin Adler in:
https://github.com/p11-glue/p11-kit/issues/425
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/compat.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 23e97903b0945e7819854059873547d583439af8
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-29
trust: Replace deprecated node_asn and ASN1_ARRAY_TYPE macro usage
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/asn1.c | 30 +++++++++++++++---------------
trust/asn1.h | 12 ++++++------
trust/builder.c | 22 +++++++++++-----------
trust/enumerate.c | 4 ++--
trust/enumerate.h | 2 +-
trust/extract-openssl.c | 18 +++++++++---------
trust/frob-bc.c | 4 ++--
trust/frob-cert.c | 4 ++--
trust/frob-eku.c | 4 ++--
trust/frob-ext.c | 4 ++--
trust/frob-ku.c | 4 ++--
trust/frob-oid.c | 4 ++--
trust/parser.c | 16 ++++++++--------
trust/persist.c | 6 +++---
trust/test-asn1.c | 6 +++---
trust/test-oid.c | 4 ++--
trust/test-x509.c | 4 ++--
trust/x509.c | 16 ++++++++--------
trust/x509.h | 6 +++---
19 files changed, 85 insertions(+), 85 deletions(-)
commit d1782b694f75f4a7c1449b2d006df7aeaffbb576
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-07-27
pkcs11-gnu: Enable testing with <p11-kit/pkcs11x.h>
This ensures that programs using <p11-kit/pkcs11x.h> can be compiled
with CRYPTOKI_GNU. The previous coverage was partial as pkcs11-gnu.c
didn't include "pkcs11x.h" and Meson didn't supply -DCRYPTOKI_GNU=1.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/meson.build | 3 +++
p11-kit/p11-kit.h | 5 +++++
p11-kit/pkcs11-gnu.c | 5 +++++
3 files changed, 13 insertions(+)
commit 7675f8672ffcf7641fd048533747937d30fb8e8e
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-06-19
common/pkcs11x.h: Support CRYPTOKI_GNU for IBM vendor mechanisms
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/pkcs11x.h | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
commit b8578017339dd5898967c1d806e340e09fdc44dd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-06-19
README.md: Remove status badge for Travis CI which is no longer used
Signed-off-by: Daiki Ueno <ueno@gnu.org>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ce5a4f3bace5890f28cadc6abd5749054825ab09
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-05-31
build: Use SHLEXT instead of hard-coding ".so"
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/test-conf.c | 16 ++++++++--------
p11-kit/test-transport.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
commit cb9314886798e3f20ce4e914fc0599738ce97586
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-05-31
build: Make sure to append EXEEXT when spawning our own executables
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/p11-kit.c | 2 +-
p11-kit/test-server.c | 3 ++-
p11-kit/test-transport.c | 2 +-
trust/extract.c | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
commit 6add9dc45f44eff9691f347dad43986d832ae90d
Author: Frederik Boster <frederik@boster.de>
Date: 2022-06-02
#379 Fix support for epoch time 0 in JKS for reproducibility
trust/extract-jks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7ea59012c2c81473132211e29ea8ebcc1ce31d09
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-11
Add support for CKM_AES_GCM
It takes a CK_GCM_PARAMS structure as mechanism parameter.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 9 +++++++
2 files changed, 79 insertions(+)
commit 3c0be1d42d0568550797d86355cd03204e4c4eb6
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-11
Add support for CKM_AES_CTR
It takes a CK_AES_CTR_PARAMS structure as mechanism parameter.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 9 ++++++++
2 files changed, 71 insertions(+)
commit 506b9414999edfc993e9142b4bad068060c587bf
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
rpc: Handle special cases for buffer and length
When the buffer is not NULL, but the length is zero then treat this as an
empty message. Serialize this in a special way so that the server can
restore the same situation.
Example: Terminate an operation via C_XxxFinal, but there is no more
data for the final part. A call to C_XxxFinal with buffer=NULL and length=0
would be treated as a size query, and would not terminate the operation.
So the way to terminate the operation without more data is to specify
buffer!=NULL but length=0.
When sending a byte array, and the buffer is NULL, and the length is
zero, don't treat this is invalid, but as empty message.
Example: C_XxxUpdate with an empty message.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-client.c | 2 +-
p11-kit/rpc-message.c | 2 +-
p11-kit/rpc-server.c | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
commit b72aa478baaa29c6ee4342d1a194938590f389df
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
Add support for CKM_DH_PKCS_DERIVE
It takes the the public value of the other party as mechanism parameter.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 41 +++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 11 +++++++++++
2 files changed, 52 insertions(+)
commit 7235af663b95e3e0a7c035d3de7f26c0c6a4810e
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
Add support for MAC and HMAC general mechanisms
The take a mechanism parameter of type CK_MAC_GENERAL_PARAMS which
is a CK_ULONG.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 11 ++++++++++
2 files changed, 70 insertions(+)
commit ac0da8239de4184dab2d48a4350503ef278db2a4
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
Add support for missing AES and DES/DES3 mechanisms
They take a 16 byte (AES) or 8 byte (DES/DES3) IV as mechanism parameter.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 18 ++++++++++
2 files changed, 113 insertions(+)
commit 242e5db070f7b17cf3d2e86b40b77f2e999ea3da
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
Add other SHA variants, also for RSA and EC signatures
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
commit c4ade85343b9cbe128e105839e454d2423c00c98
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
Fix support of CKA_DERIVE_TEMPLATE
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 1 +
1 file changed, 1 insertion(+)
commit 218e9719b5a47a65fbf6131a5b69825948c1d4e0
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-08
client: Allow zero part length at C_SignUpdate
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-client.c | 2 --
1 file changed, 2 deletions(-)
commit d07a8ffc0f287bef66295fffcbe9c7ccba711ef0
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-07
Add support for serializing CK_ECDH1_DERIVE_PARAMS mech param
Used by CKM_ECDH1_DERIVE, CKM_IBM_EC_X25519 and CKM_IBM_EC_X448.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
p11-kit/rpc-message.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-
p11-kit/rpc-message.h | 11 +++++++
2 files changed, 89 insertions(+), 1 deletion(-)
commit 4059f174042fc76be0b258b27061e351306a74ff
Author: Ingo Franzki <ifranzki@linux.ibm.com>
Date: 2022-04-07
Add IBM specific mechanism and attributes
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
common/attrs.c | 17 ++++++++++
common/constants.c | 38 +++++++++++++++++++++++
common/pkcs11x.h | 51 ++++++++++++++++++++++++++++++
p11-kit/rpc-message.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++-
p11-kit/rpc-message.h | 12 +++++++
5 files changed, 203 insertions(+), 1 deletion(-)
commit 72335286ff1183ec17c5002a7df8d1eceeef55ec
Author: 13362041868 <490514142@qq.com>
Date: 2022-04-26
The usage string of p11_tool_desc usages in trust/dump.c should uses "trust dump" p11_tool_desc usages[] = { { 0, "usage: trust dump--filter=" }
trust/dump.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e06aa5dd1a74de9bb2a1d30dd72b4c0ea34fac9d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-02-04
meson: revert the p11_system_config_modules pkg-config variable
For compatibility reasons, we keep p11_system_config_modules pointing
to p11_package_config_modules in the pkg-config file.
Spotted by Debarshi Ray in:
https://github.com/p11-glue/p11-kit/pull/377#pullrequestreview-872572645
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit dd0590d4e583f107e3e9fafe9ed754149da335d0
Author: Daiki Ueno <ueno@gnu.org>
Date: 2022-01-17
Release 0.24.1
Signed-off-by: Daiki Ueno <ueno@gnu.org>
NEWS | 7 +++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
commit 4589625f3038d85cada8555fc457ad30ca2bfd06
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-05-30
common: Support copying attribute array recursively
This enables p11_attrs_build to build an attribute list with arrays of
attributes indicated with CKF_ARRAY_ATTRIBUTE. A couple of new
internal functions have been added: p11_attr_copy and p11_attr_clear.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/attrs.c | 80 +++++++++++++++++++++++++++++++++++++++++++++--------
common/attrs.h | 3 ++
common/test-attrs.c | 36 ++++++++++++++++++++++++
3 files changed, 107 insertions(+), 12 deletions(-)
commit b9da18d6994b3a718248f59f1f080d4f6fe97b8c
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-01
common: Add assert_ptr_cmp
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/test.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 9f01a8a45ba913a9b65894cef9369b6010005096
Author: Eli Schwartz <eschwartz@archlinux.org>
Date: 2022-01-11
gtkdoc: remove dependencies on custom target files
Sadly, the `dependencies` kwarg does not actually do what it seems to be
trying to be used for, here. It is for listing dependency or library
objects whose compiler flags should be added to gtkdoc-scangobj.
It will not actually add ninja target dependencies. The similar kwarg in
other meson functions (e.g. genmarshal and compile_schemas) that *do*
allow adding target dependencies, is `depend_files`.
Older versions of meson simply did nothing in an if/elif/elif block
where these custom_targets never matched anything, and were thus
silently ignored.
Meson 0.61 type-validates the arguments and rejects CustomTarget as
invalid:
```
doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary]
```
Fixes #406
doc/manual/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 04f85857b3029fd28c7c731aef89f61b22e846d3
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-11-26
doc: Replace occurrence of black list with blocklist
This is a follow-up of 47fabc2366d917e255241c41a6cfc179af372644.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
doc/manual/pkcs11.conf.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fd7c4e7e9496a7b4b2a26430e8969f27fb38457e
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-10-16
build: Suppress cppcheck false-positive on array bounds
Cppcheck 2.6 reports the following errors, when loops on arrays depend
on a sentinel:
trust/builder.c:1103,error,arrayIndexOutOfBounds,Array 'schema->attrs[32]' accessed at index 9998, which is out of bounds.
trust/builder.c:1136,error,arrayIndexOutOfBounds,Array 'schema->attrs[32]' accessed at index 9998, which is out of bounds.
trust/builder.c:1301,error,arrayIndexOutOfBounds,Array 'ku_attribute_map[8]' accessed at index 9998, which is out of bounds.
trust/builder.c:1385,error,arrayIndexOutOfBounds,Array 'eku_attribute_map[9]' accessed at index 9998, which is out of bounds.
This adds an extra check to those loop conditions. While it is
redundant, this should be harmless as it is not in the performance
critical path.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/builder.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
commit 2d34226781e89c23cef13833a3db25b1d59d9b07
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-10-16
ci: Use Docker image from the same repository
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/test.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit c643379626e6ea1d22ab406aafc0beed35b81ab3
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-10-16
ci: Integrate Docker image building to GitHub workflow
Signed-off-by: Daiki Ueno <ueno@gnu.org>
.github/workflows/build-image.yml | 39 +++++++++++++++++++++++++++++++++++++++
ci/Dockerfile | 9 +++++++++
2 files changed, 48 insertions(+)
commit 0bc75cae1057b03e3d790c741adf97ac9b4dbe92
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-09-18
rpc: Fallback to version 0 if server does not support negotiation
Old servers without support for version negotiation cannot handle
version bytes other than 0 and will close the connection if a version
byte greater than 0 is received. This adds a fallback mechanism to
reconnect and reauthenticate with version 0 in that situation for
backward compatibility.
Suggested by Owen Taylor.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-client.c | 16 ++++++++++++++++
p11-kit/rpc-transport.c | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
commit fdf3f1f28b946ee737b55b4313f8a7f7a02143f3
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-08-24
build: Port e850e03be65ed573d0b69ee0408e776c08fad8a3 to meson
Also expand the comment in configure.ac.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
configure.ac | 7 ++++---
p11-kit/meson.build | 6 ++++++
2 files changed, 10 insertions(+), 3 deletions(-)
commit e850e03be65ed573d0b69ee0408e776c08fad8a3
Author: Emmanuel Dreyfus <manu@netbsd.org>
Date: 2021-08-24
Link libp11-kit so that it cannot unload
libp11-kit installs a pthread_atfork() callback to count forks. If the
library gets unloaded, a stale pointer is called on the next fork(),
leading to a crash.
This fix adds -z nodelete linker flag so that libp11-kit cannot be
unloaded. Unfortunately, that only fixes the problem for GNU ld.
More additionnal flags will be required for other linkers.
configure.ac | 13 +++++++++++++
p11-kit/Makefile.am | 1 +
2 files changed, 14 insertions(+)
commit 509c1c949751c554e6244f2b42f1ce905e02f47d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-07-22
trust: Use dngettext for plurals
Suggested by Rafael Fontenelle in:
https://github.com/p11-glue/p11-kit/issues/380
Signed-off-by: Daiki Ueno <ueno@gnu.org>
trust/anchor.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 4769c479a3c41d68a293d007dd9e17a763001239
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-04
rpc: Support protocol version negotiation
This works as follows:
- a couple of build-time constants have been added to represent the
minimal and maximum supported protocol versions
- the client sends the maximum supported version upon connection
establishment (when C_Initialize is called for first time from the
client process)
- the server checks the version sent from the client; if it is lower
than the minimum supported version of the server, sends an error
- otherwise, the server responds with either of smaller value between
the version sent from the client and the maximum supported version of
the server
Signed-off-by: Daiki Ueno <ueno@gnu.org>
configure.ac | 36 ++++++++++++++++++++++++++++++++++++
meson.build | 10 ++++++++++
meson_options.txt | 8 ++++++++
p11-kit/rpc-client.c | 6 +++++-
p11-kit/rpc-server.c | 27 ++++++++++++++++++---------
p11-kit/rpc-transport.c | 18 ++++++++++++++----
p11-kit/rpc.h | 4 +++-
p11-kit/test-rpc.c | 4 +++-
8 files changed, 97 insertions(+), 16 deletions(-)
commit 2237f95b27e19f5f967c70ba8862a821e1e7de33
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-04
rpc: Separate authentication step from transaction
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-client.c | 4 ++++
p11-kit/rpc-transport.c | 61 ++++++++++++++++++++++++++++++-------------------
p11-kit/rpc.h | 2 ++
p11-kit/test-rpc.c | 30 ++++++++++++++++--------
4 files changed, 64 insertions(+), 33 deletions(-)
commit 576bba3c34d6994e8b02051d94e6446bb0631ca1
Author: Issam E. Maghni <issam.e.maghni@mailbox.org>
Date: 2021-06-16
Meson: p11_system_config_modules instead of p11_package_config_modules
p11-kit/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a36228a06ad87ea6fe429a8c4705d68b2780e0d9
Author: Issam E. Maghni <issam.e.maghni@mailbox.org>
Date: 2021-06-15
shell: test -a|o is not POSIX
configure.ac | 2 +-
p11-kit/test-server.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 79a0a3f235e44c174dd8efe5e2fe942812d18179
Author: Issam E. Maghni <issam.e.maghni@mailbox.org>
Date: 2021-06-13
Meson: Add libtasn1 to trust programs
trust/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 40d3ab265bff4cca10f1e0b7ed60f037511ee477
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: 2021-06-10
meson: optionalise glib's development files for gtk_doc
In p11-kit, only installation prefix of glib is required to build gtk-doc.
In some distro, those development files are splitted into separated
package. Pulling those development files in will pull its development
dependencies, too.
Let's give our users an option to build gtk-doc without development
files of glib.
doc/manual/meson.build | 5 ++++-
meson_options.txt | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
commit 34826623f58399b24c21f1788e2cdaea34521b7b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-03
common: Only check strndup behavior when replacement is used
Otherwise GCC 11 complains with -Wstringop-overread.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/test-compat.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 9832f8b0ce334d269f2c6037ba5daf48057f3bcf
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-03
Release 0.24.0
Signed-off-by: Daiki Ueno <ueno@gnu.org>
NEWS | 9 +++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
commit bd0970c8925bc7fb523d4c06088a4b4e031f31cf
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-11
Release 0.23.22
NEWS | 10 ++++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
commit 0dd01822166eaa1addc7300fd0dba25ef66e9083
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-06-03
rpc: Tighten attribute array check with manual enumeration
CKF_ARRAY_ATTRIBUTE is not sufficient to tell if the attribute is
an array of attributes, because the flag is also set for
CKA_ALLOWED_MECHANISMS, which is an array of CK_MECHANISM_TYPE
(unsigned long). Moreover, our vendor prefix 0x58444700UL masks
the bit.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/attrs.h | 10 ++++++++++
p11-kit/rpc-client.c | 3 ++-
p11-kit/rpc-server.c | 3 ++-
3 files changed, 14 insertions(+), 2 deletions(-)
commit 96c7b934d1a41e85f8b0e6dfce527fd055773f65
Author: Claes Nästén <pekdon@gmail.com>
Date: 2021-04-30
Check for SUN_LEN and provide fallback
SUN_LEN is not available on Solaris 10, provide a fallback.
common/compat.h | 10 ++++++++++
configure.ac | 2 +-
meson.build | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
commit 6e7401e9e56b746c25acacb537187acbf53303f5
Author: Claes Nästén <pekdon@gmail.com>
Date: 2021-04-30
Do not define _XOPEN_SOURCE in compat.c on Solaris
Defining _XOPEN_SOURCE 700 on Solaris makes the compile fail due to
a feature check in sys/feature_tests.h, C99 compiler in combination
with < XPG6 feature set is not supported.
common/compat.c | 5 +++++
1 file changed, 5 insertions(+)
commit 3ec2e9ff9a56b4c0cc6aa52daeb55deca4b0a99e
Author: Claes Nästén <pekdon@gmail.com>
Date: 2021-04-30
make autogen.sh a bit more portable
cp -v does not work on Solaris 10, nor does $() with /bin/sh so instead
go for non verbose as -e will echo the commands performed anyway and
use backticks.
autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit b3243a754763f6df19351593781b88e277a324bc
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-05-23
rpc-server: Disable parsing CKF_ARRAY_ATTRIBUTE
This is a temporary measure to avoid oss-fuzz failure. When the
attribute array is nested, the current internal API cannot determine
the actual size of data that need to be stored, because ulValueLen is
set to the attribute count times sizeof(CK_ATTRIBUTE).
Signed-off-by: Daiki Ueno <ueno@gnu.org>
p11-kit/rpc-client.c | 5 +++++
p11-kit/rpc-server.c | 5 +++++
2 files changed, 10 insertions(+)
commit 34b568727ff98ebb36f45a3d63c07f165c58219b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-27
Update README.md
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 0ecce9f3b99f0f699ad46495f37eb541b17c691f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-27
README.md: Suggest using only meson sub-commands instead of ninja
README.md | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
commit 3d9e39d0173b58e66554d9b61f08d09b7db5bf43
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-27
p11-kit: Add missing <limits.h> include for SIZE_MAX
Spotted by Jeffrey Walton in:
https://github.com/p11-glue/p11-kit/issues/361
p11-kit/lists.c | 1 +
1 file changed, 1 insertion(+)
commit bff7e36649c97aaaac29b7b16021af75386bdaee
Author: Tomas Tomecek <ttomecek@redhat.com>
Date: 2021-03-10
packit: drop synced_files
packit's default is specfile + packit.yaml, so this can be omitted:
https://packit.dev/docs/configuration/#synced_files
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
.packit.yaml | 3 ---
1 file changed, 3 deletions(-)
commit 4711af41a2b166c0ba8cb7b508ce865727ec12d2
Author: Tomas Tomecek <ttomecek@redhat.com>
Date: 2021-03-10
packit: fedora renamed master branch to rawhide
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
.packit.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit be8fc2ae73ef2ed2338d0f745b6233629e4330c4
Author: Yuri Chornoivan <yurchor@ukr.net>
Date: 2021-03-06
Fix minor typo
trust/enumerate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d0742257046f656882ed3068f608f0e192aee448
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-06
po: Add trust/trust.c to POTFILES.in
Pointed by Piotr Drąg.
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit 4085803ef7ad55aa1e22ee598362134116566513
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-06
po: Update POTFILES.in
po/POTFILES.in | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
commit cdff966cd8dc51d1cca79892565e4dab66290625
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-05
trust: Make more strings translatable
trust/anchor.c | 47 +++++++++++++++++++++++++++--------------------
trust/builder.c | 47 +++++++++++++++++++++++++++--------------------
trust/dump.c | 11 +++++++++--
trust/enumerate.c | 33 ++++++++++++++++++++-------------
trust/extract-cer.c | 15 +++++++++++----
trust/extract-edk2.c | 9 ++++++++-
trust/extract-jks.c | 21 ++++++++++++++-------
trust/extract-openssl.c | 11 +++++++++--
trust/extract-pem.c | 11 +++++++++--
trust/extract.c | 23 +++++++++++++++--------
trust/list.c | 11 +++++++++--
trust/module.c | 13 ++++++++++---
trust/parser.c | 15 +++++++++++----
trust/persist.c | 9 ++++++++-
trust/save.c | 41 ++++++++++++++++++++++++-----------------
trust/token.c | 23 +++++++++++++++--------
trust/trust.c | 12 +++++++-----
17 files changed, 233 insertions(+), 119 deletions(-)
commit 4fc5956fcbf354d42feb3d3c6b72af26fac94436
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-05
p11-kit: Make more strings translatable
p11-kit/conf.c | 21 ++++++++-----
p11-kit/filter.c | 9 +++++-
p11-kit/lists.c | 15 ++++++---
p11-kit/messages.c | 2 +-
p11-kit/modules.c | 41 ++++++++++++++-----------
p11-kit/p11-kit.c | 18 ++++++++---
p11-kit/remote.c | 13 ++++++--
p11-kit/rpc-client.c | 27 +++++++++++------
p11-kit/rpc-message.c | 17 ++++++++---
p11-kit/rpc-server.c | 31 +++++++++++--------
p11-kit/rpc-transport.c | 71 ++++++++++++++++++++++++-------------------
p11-kit/server.c | 81 +++++++++++++++++++++++++++----------------------
12 files changed, 212 insertions(+), 134 deletions(-)
commit d1134f3aad404b1eda40d4889c74065d8bd4e2ec
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-05
common: Enable message translation in p11_tool_main
common/tool.c | 45 ++++++++++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 9 deletions(-)
commit 2ccffb50013a930264e151109dc3055c3bf83205
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-05
meson: Make sure to set PROJECT_NAME and ENABLE_NLS for 'nls' option
Pointed out by Érico Nogueira Rolim in:
https://github.com/p11-glue/p11-kit/issues/357
meson.build | 5 +++++
1 file changed, 5 insertions(+)
commit 58c8ef1a02f05c22c09afacb6efb53b4f85ddf1a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-03-03
build: Add fuzz/meson.build in the distribution
fuzz/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 3e7451ecdd5c9ebca06e685ded5ceb6fb177b6b2
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-08
fuzz: Move the directory out of build/
The "build/" directory is mainly used for the artifacts not shipped in
the distribution (except "build/litter" and "build/m4", which are
populated by autotools).
Makefile.am | 2 +-
{build/fuzz => fuzz}/Makefile.am | 10 +++++-----
{build/fuzz => fuzz}/fuzz.h | 0
{build/fuzz => fuzz}/main.c | 0
{build/fuzz => fuzz}/meson.build | 0
{build/fuzz => fuzz}/rpc.in/C_CloseAllSessions_slot_one | Bin
{build/fuzz => fuzz}/rpc.in/C_CloseAllSessions_slot_two | Bin
{build/fuzz => fuzz}/rpc.in/C_CloseSession | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_attribute_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_byte | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_byte_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_date | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_date_empty | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_invalid | Bin
.../fuzz => fuzz}/rpc.in/C_CopyObject_mechanism_type_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CopyObject_ulong | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_attribute_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_byte | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_byte_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_date | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_date_empty | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_invalid | Bin
.../rpc.in/C_CreateObject_mechanism_type_array | Bin
{build/fuzz => fuzz}/rpc.in/C_CreateObject_ulong | Bin
{build/fuzz => fuzz}/rpc.in/C_Decrypt | Bin
{build/fuzz => fuzz}/rpc.in/C_DecryptDigestUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_DecryptFinal | Bin
{build/fuzz => fuzz}/rpc.in/C_DecryptInit | Bin
{build/fuzz => fuzz}/rpc.in/C_DecryptUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_DecryptVerifyUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_DeriveKey | Bin
{build/fuzz => fuzz}/rpc.in/C_DestroyObject | Bin
{build/fuzz => fuzz}/rpc.in/C_Digest | Bin
{build/fuzz => fuzz}/rpc.in/C_DigestEncryptUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_DigestFinal | Bin
{build/fuzz => fuzz}/rpc.in/C_DigestInit | Bin
{build/fuzz => fuzz}/rpc.in/C_DigestKey | Bin
{build/fuzz => fuzz}/rpc.in/C_DigestUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_Encrypt | Bin
{build/fuzz => fuzz}/rpc.in/C_EncryptFinal | Bin
{build/fuzz => fuzz}/rpc.in/C_EncryptInit | Bin
{build/fuzz => fuzz}/rpc.in/C_EncryptUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_Finalize | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjects | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsFinal | Bin
.../fuzz => fuzz}/rpc.in/C_FindObjectsInit_attribute_array | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_byte | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_byte_array | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_date | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_date_empty | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_invalid | Bin
.../rpc.in/C_FindObjectsInit_mechanism_type_array | Bin
{build/fuzz => fuzz}/rpc.in/C_FindObjectsInit_ulong | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKeyPair | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_attribute_array | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_byte | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_byte_array | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_date | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_date_empty | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_invalid | Bin
.../fuzz => fuzz}/rpc.in/C_GenerateKey_mechanism_type_array | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateKey_ulong | Bin
{build/fuzz => fuzz}/rpc.in/C_GenerateRandom | Bin
{build/fuzz => fuzz}/rpc.in/C_GetAttributeValue | Bin
{build/fuzz => fuzz}/rpc.in/C_GetInfo | Bin
{build/fuzz => fuzz}/rpc.in/C_GetMechanismInfo | Bin
.../rpc.in/C_GetMechanismInfo_slot_one_capitalize | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismInfo_slot_one_prefix | Bin
.../rpc.in/C_GetMechanismInfo_slot_two_capitalize | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismInfo_slot_two_prefix | Bin
{build/fuzz => fuzz}/rpc.in/C_GetMechanismList | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismList_slot_one_buffer | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismList_slot_one_length | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismList_slot_two_buffer | Bin
.../fuzz => fuzz}/rpc.in/C_GetMechanismList_slot_two_length | Bin
{build/fuzz => fuzz}/rpc.in/C_GetObjectSize | Bin
{build/fuzz => fuzz}/rpc.in/C_GetOperationState | Bin
{build/fuzz => fuzz}/rpc.in/C_GetSessionInfo | Bin
{build/fuzz => fuzz}/rpc.in/C_GetSlotInfo_slot_one | Bin
{build/fuzz => fuzz}/rpc.in/C_GetSlotInfo_slot_two | Bin
{build/fuzz => fuzz}/rpc.in/C_GetSlotList_all_buffer | Bin
{build/fuzz => fuzz}/rpc.in/C_GetSlotList_all_length | Bin
.../fuzz => fuzz}/rpc.in/C_GetSlotList_token_present_buffer | Bin
.../fuzz => fuzz}/rpc.in/C_GetSlotList_token_present_length | Bin
{build/fuzz => fuzz}/rpc.in/C_GetTokenInfo_slot_one | Bin
{build/fuzz => fuzz}/rpc.in/C_GetTokenInfo_slot_two | Bin
{build/fuzz => fuzz}/rpc.in/C_InitPIN | Bin
{build/fuzz => fuzz}/rpc.in/C_InitToken_slot_one | Bin
{build/fuzz => fuzz}/rpc.in/C_InitToken_slot_two | Bin
{build/fuzz => fuzz}/rpc.in/C_Initialize | Bin
{build/fuzz => fuzz}/rpc.in/C_Login | Bin
{build/fuzz => fuzz}/rpc.in/C_Logout | Bin
{build/fuzz => fuzz}/rpc.in/C_OpenSession_slot_one | Bin
{build/fuzz => fuzz}/rpc.in/C_OpenSession_slot_two | Bin
{build/fuzz => fuzz}/rpc.in/C_SeedRandom | Bin
.../rpc.in/C_SetAttributeValue_attribute_array | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_byte | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_byte_array | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_date | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_date_empty | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_invalid | Bin
.../rpc.in/C_SetAttributeValue_mechanism_type_array | Bin
{build/fuzz => fuzz}/rpc.in/C_SetAttributeValue_ulong | Bin
{build/fuzz => fuzz}/rpc.in/C_SetOperationState | Bin
{build/fuzz => fuzz}/rpc.in/C_SetPIN | Bin
{build/fuzz => fuzz}/rpc.in/C_Sign | Bin
{build/fuzz => fuzz}/rpc.in/C_SignEncryptUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_SignFinal | Bin
{build/fuzz => fuzz}/rpc.in/C_SignInit | Bin
{build/fuzz => fuzz}/rpc.in/C_SignRecover | Bin
{build/fuzz => fuzz}/rpc.in/C_SignRecoverInit | Bin
{build/fuzz => fuzz}/rpc.in/C_SignUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_UnwrapKey | Bin
{build/fuzz => fuzz}/rpc.in/C_Verify | Bin
{build/fuzz => fuzz}/rpc.in/C_VerifyFinal | Bin
{build/fuzz => fuzz}/rpc.in/C_VerifyInit | Bin
{build/fuzz => fuzz}/rpc.in/C_VerifyRecover | Bin
{build/fuzz => fuzz}/rpc.in/C_VerifyRecoverInit | Bin
{build/fuzz => fuzz}/rpc.in/C_VerifyUpdate | Bin
{build/fuzz => fuzz}/rpc.in/C_WaitForSlotEvent | Bin
{build/fuzz => fuzz}/rpc.in/C_WrapKey | Bin
{build/fuzz => fuzz}/rpc_fuzzer.c | 2 +-
{build/fuzz => fuzz}/run-afl.sh | 0
meson.build | 2 +-
124 files changed, 8 insertions(+), 8 deletions(-)
commit 6aa3ce13de298c9ecaa6628c6223002590ebbdf8
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-14
Release all library/mock resources before exit
build/fuzz/rpc_fuzzer.c | 2 ++
1 file changed, 2 insertions(+)
commit cf304848641b32664c72da263400e90a3c9752ce
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-14
Add separate oss-fuzz Makefile target
OSS-Fuzz infrastructure requires some slightly different build commands,
such as using $CXX to link, and using main() from $LIB_FUZZING_ENGINE.
build/fuzz/Makefile.am | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit 22de027e72d9d696715026d657283b732010691f
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-14
Add build targets for future additional fuzzers
This could simplify a future integration with OSS-Fuzz, and the future
addition of a second fuzzer target.
build/fuzz/Makefile.am | 5 ++++-
build/fuzz/meson.build | 20 +++++++++++++-------
2 files changed, 17 insertions(+), 8 deletions(-)
commit d3dc57f0d589e62cbba45011d68f6d7933c0a859
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
Build fuzzer target from meson/ninja
build/fuzz/meson.build | 17 +++++++++++++++++
meson.build | 1 +
2 files changed, 18 insertions(+)
commit c5267ff2955bc2bff8bdac2d11f71d6ec5b0c4f1
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
Explicit dependency for virtual-fixed-generated.h
This is needed for `make build/fuzz/rpc_fuzzer` to work from a clean
directory.
p11-kit/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit ba745124bdd0c4b13027237f7b98679c262b7a88
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
Build fuzzer target from automake
.gitignore | 1 +
Makefile.am | 1 +
build/fuzz/Makefile.am | 5 +++++
build/fuzz/fuzz.h | 16 ++++++++++++++++
build/fuzz/main.c | 2 +-
build/fuzz/meson.build | 0
build/fuzz/rpc_fuzzer.c | 4 ++--
build/fuzz/run-afl.sh | 2 +-
8 files changed, 27 insertions(+), 4 deletions(-)
commit bf35d3c5aad0dc11e93321fc4540ace8063f888a
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
rpc_fuzzer: Clean up buffer before exit
build/fuzz/rpc_fuzzer.c | 2 ++
1 file changed, 2 insertions(+)
commit b1dd01b51eaf03cb3bb38fcdeb3ff461ab88f9b3
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-06
New set of fuzzer seeds
build/fuzz/rpc.in/C_CloseAllSessions_slot_one | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_CloseAllSessions_slot_two | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_CloseSession | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_CopyObject_attribute_array | Bin 0 -> 55 bytes
build/fuzz/rpc.in/C_CopyObject_byte | Bin 0 -> 42 bytes
build/fuzz/rpc.in/C_CopyObject_byte_array | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_CopyObject_date | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_CopyObject_date_empty | Bin 0 -> 45 bytes
build/fuzz/rpc.in/C_CopyObject_invalid | Bin 0 -> 37 bytes
build/fuzz/rpc.in/C_CopyObject_mechanism_type_array | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_CopyObject_ulong | Bin 0 -> 49 bytes
build/fuzz/rpc.in/C_CreateObject_attribute_array | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_CreateObject_byte | Bin 0 -> 33 bytes
build/fuzz/rpc.in/C_CreateObject_byte_array | Bin 0 -> 37 bytes
build/fuzz/rpc.in/C_CreateObject_date | Bin 0 -> 44 bytes
build/fuzz/rpc.in/C_CreateObject_date_empty | Bin 0 -> 36 bytes
build/fuzz/rpc.in/C_CreateObject_invalid | Bin 0 -> 28 bytes
build/fuzz/rpc.in/C_CreateObject_mechanism_type_array | Bin 0 -> 44 bytes
build/fuzz/rpc.in/C_CreateObject_ulong | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_Decrypt | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DecryptDigestUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DecryptFinal | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_DecryptInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_DecryptUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DecryptVerifyUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DeriveKey | Bin 0 -> 51 bytes
build/fuzz/rpc.in/C_DestroyObject | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_Digest | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DigestEncryptUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_DigestFinal | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_DigestInit | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_DigestKey | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_DigestUpdate | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_Encrypt | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_EncryptFinal | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_EncryptInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_EncryptUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_Finalize | Bin 0 -> 8 bytes
build/fuzz/rpc.in/C_FindObjects | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_FindObjectsFinal | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_FindObjectsInit_attribute_array | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_FindObjectsInit_byte | Bin 0 -> 33 bytes
build/fuzz/rpc.in/C_FindObjectsInit_byte_array | Bin 0 -> 37 bytes
build/fuzz/rpc.in/C_FindObjectsInit_date | Bin 0 -> 44 bytes
build/fuzz/rpc.in/C_FindObjectsInit_date_empty | Bin 0 -> 36 bytes
build/fuzz/rpc.in/C_FindObjectsInit_invalid | Bin 0 -> 28 bytes
.../rpc.in/C_FindObjectsInit_mechanism_type_array | Bin 0 -> 44 bytes
build/fuzz/rpc.in/C_FindObjectsInit_ulong | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_GenerateKeyPair | Bin 0 -> 58 bytes
build/fuzz/rpc.in/C_GenerateKey_attribute_array | Bin 0 -> 62 bytes
build/fuzz/rpc.in/C_GenerateKey_byte | Bin 0 -> 42 bytes
build/fuzz/rpc.in/C_GenerateKey_byte_array | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_GenerateKey_date | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_GenerateKey_date_empty | Bin 0 -> 45 bytes
build/fuzz/rpc.in/C_GenerateKey_invalid | Bin 0 -> 37 bytes
build/fuzz/rpc.in/C_GenerateKey_mechanism_type_array | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_GenerateKey_ulong | Bin 0 -> 49 bytes
build/fuzz/rpc.in/C_GenerateRandom | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetAttributeValue | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_GetInfo | Bin 0 -> 8 bytes
build/fuzz/rpc.in/C_GetMechanismInfo | Bin 0 -> 26 bytes
.../rpc.in/C_GetMechanismInfo_slot_one_capitalize | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_GetMechanismInfo_slot_one_prefix | Bin 0 -> 26 bytes
.../rpc.in/C_GetMechanismInfo_slot_two_capitalize | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_GetMechanismInfo_slot_two_prefix | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_GetMechanismList | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetMechanismList_slot_one_buffer | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetMechanismList_slot_one_length | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetMechanismList_slot_two_buffer | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetMechanismList_slot_two_length | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetObjectSize | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_GetOperationState | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_GetSessionInfo | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_GetSlotInfo_slot_one | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_GetSlotInfo_slot_two | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_GetSlotList_all_buffer | Bin 0 -> 16 bytes
build/fuzz/rpc.in/C_GetSlotList_all_length | Bin 0 -> 16 bytes
build/fuzz/rpc.in/C_GetSlotList_token_present_buffer | Bin 0 -> 16 bytes
build/fuzz/rpc.in/C_GetSlotList_token_present_length | Bin 0 -> 16 bytes
build/fuzz/rpc.in/C_GetTokenInfo_slot_one | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_GetTokenInfo_slot_two | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_InitPIN | Bin 0 -> 32 bytes
build/fuzz/rpc.in/C_InitToken_slot_one | Bin 0 -> 47 bytes
build/fuzz/rpc.in/C_InitToken_slot_two | Bin 0 -> 47 bytes
build/fuzz/rpc.in/C_Initialize | Bin 0 -> 66 bytes
build/fuzz/rpc.in/C_Login | Bin 0 -> 33 bytes
build/fuzz/rpc.in/C_Logout | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_OpenSession_slot_one | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_OpenSession_slot_two | Bin 0 -> 26 bytes
build/fuzz/rpc.in/C_SeedRandom | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_SetAttributeValue_attribute_array | Bin 0 -> 55 bytes
build/fuzz/rpc.in/C_SetAttributeValue_byte | Bin 0 -> 42 bytes
build/fuzz/rpc.in/C_SetAttributeValue_byte_array | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_SetAttributeValue_date | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_SetAttributeValue_date_empty | Bin 0 -> 45 bytes
build/fuzz/rpc.in/C_SetAttributeValue_invalid | Bin 0 -> 37 bytes
.../rpc.in/C_SetAttributeValue_mechanism_type_array | Bin 0 -> 53 bytes
build/fuzz/rpc.in/C_SetAttributeValue_ulong | Bin 0 -> 49 bytes
build/fuzz/rpc.in/C_SetOperationState | Bin 0 -> 42 bytes
build/fuzz/rpc.in/C_SetPIN | Bin 0 -> 43 bytes
build/fuzz/rpc.in/C_Sign | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_SignEncryptUpdate | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_SignFinal | Bin 0 -> 23 bytes
build/fuzz/rpc.in/C_SignInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_SignRecover | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_SignRecoverInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_SignUpdate | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_UnwrapKey | Bin 0 -> 74 bytes
build/fuzz/rpc.in/C_Verify | Bin 0 -> 63 bytes
build/fuzz/rpc.in/C_VerifyFinal | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_VerifyInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_VerifyRecover | Bin 0 -> 46 bytes
build/fuzz/rpc.in/C_VerifyRecoverInit | Bin 0 -> 35 bytes
build/fuzz/rpc.in/C_VerifyUpdate | Bin 0 -> 40 bytes
build/fuzz/rpc.in/C_WaitForSlotEvent | Bin 0 -> 17 bytes
build/fuzz/rpc.in/C_WrapKey | Bin 0 -> 50 bytes
build/fuzz/rpc.in/transcript | Bin 146 -> 0 bytes
build/fuzz/transcript | Bin 5694933 -> 0 bytes
118 files changed, 0 insertions(+), 0 deletions(-)
commit de69504632b01d72e996f037baf406d994dd4aac
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-07
github: Remove unnecessary SRCDIR envvar
.github/actions/basic-autotools/action.yaml | 8 ++++----
.github/actions/basic-meson/action.yaml | 2 --
.github/workflows/test.yaml | 28 ++++++----------------------
3 files changed, 10 insertions(+), 28 deletions(-)
commit 58b14b33421064754732501e1eb67c90d8a24744
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-07
github: Use runuser instead of su for building and testing
Also run the install phase as root to emulate the practical situation.
.github/actions/basic-autotools/action.yaml | 23 +++++++++++++++--------
.github/actions/basic-meson/action.yaml | 15 ++++++++-------
.github/workflows/test.yaml | 7 ++++---
3 files changed, 27 insertions(+), 18 deletions(-)
commit 58b7336ca3891fb36ac2fa2b35298f2c57fb1561
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-06
github: Use composite action to simplify the main recipe
.github/actions/basic-autotools/action.yaml | 39 ++++++++
.github/actions/basic-meson/action.yaml | 38 +++++++
.github/workflows/test.yaml | 148 +++++-----------------------
3 files changed, 103 insertions(+), 122 deletions(-)
commit 98a7787565ef6bdf18617640968ffb717697254b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-06
github: Use pre-built container image for building
.github/workflows/test.yaml | 57 ++++++---------------------------------------
1 file changed, 7 insertions(+), 50 deletions(-)
commit c680fca15ebc1765ba1d07c9fc5c226fd00019e5
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-06
README.md: Add GitHub workflow status
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 23beb5974246b7c85ed4e3b800f2590855187cf6
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-06
travis: Remove configurations other than FreeBSD
.travis.yml | 36 ------------------------------------
1 file changed, 36 deletions(-)
commit 36eb32316b7b67b1d3b4838ee5560becd4d345bd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-02-06
autotools: Fix for VPATH build
Since adbb94ea3ec3c39b71c05eff8ef86cc85a075955, we always
generate *.asn.h file at build time. This caused a build problem if
p11-kit is built with an out-of-tree build directory.
Reported by Pavel Heimlich in:
https://github.com/p11-glue/p11-kit/issues/348
trust/Makefile.am | 4 ++++
1 file changed, 4 insertions(+)
commit 805f0ec64070ae942e7f208c2d171a6b47960081
Author: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: 2020-10-30
github actions: Initial CI setup
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
.github/workflows/test.yaml | 244 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 244 insertions(+)
commit fc852e1a04628a4b3f46a0b34f1ed164fda571e4
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-01-28
modules: p11_kit_initialize_module: Remove redundant module unref
For unmanaged modules, p11_module_release_inlock_reentrant simply
decrease the reference count. However, it should have been
incremented only if initialize_module_inlock_reentrant call above
succeeds.
p11-kit/modules.c | 1 -
1 file changed, 1 deletion(-)
commit 6a7558b23793cb25aad1a2cfc1310c9eb80d028f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-01-28
server: Account for NUL byte at the end of Unix domain socket path
p11-kit/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2ab82c324aa67a57927b7f59efa06d93ee5bbfcf
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-15
compat: Expose FreeBSD specific issetugid, getresuid, and getresgid
common/compat.c | 9 +++++++++
1 file changed, 9 insertions(+)
commit bd14b7d65b4bf2929e8793debeeba42cd7d2c757
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-15
compat: Remove <unistd.h> inclusion from compat.h
The header should be included from the C files instead for Unix
specific features.
common/compat.c | 5 +++--
common/compat.h | 1 -
common/test-compat.c | 3 +++
common/vsock.c | 3 +++
p11-kit/conf.c | 3 +++
p11-kit/test-managed.c | 1 +
p11-kit/test-rpc.c | 3 +++
p11-kit/test-transport.c | 1 +
trust/test-token.c | 3 +++
trust/token.c | 3 +++
10 files changed, 23 insertions(+), 3 deletions(-)
commit 1515a8dad4131cff456be57a281b2b5eb766f229
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-13
compat: Avoid unused variables warning in fdwalk emulation
common/compat.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit 40fbf74b02b8ad6625e3aa49d2cdef2b52e47a04
Author: Daiki Ueno <ueno@gnu.org>
Date: 2021-01-25
compat: Pacify ASan complaints on intentionally leaked buffer
Reported by Viktor Ashirov in:
https://bugzilla.redhat.com/show_bug.cgi?id=1905581
common/compat.c | 25 +++++++++++++++++++------
common/library.c | 9 +++++++++
2 files changed, 28 insertions(+), 6 deletions(-)
commit a91266ef087532e2332c75c4fd9244df66f30b64
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-18
meson: Link trust/client modules explicitly to -ldl
This adds the -ldl link flag missing in the meson build, but present
in the autotools build. Although the use-case is unlikely, this
allows those modules to be linked as a normal shared library to a
program.
p11-kit/meson.build | 1 +
trust/meson.build | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 507c394cfcf4edffc5e4450c5d737e545c26b857
Author: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: 2020-12-12
p11-kit/lists.c: Add stdint.h to fix compilation
Add stdint.h otherwise compilation fails on FreeBSD 13-CURRENT with "use of undeclared identifier 'SIZE_MAX'"
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
p11-kit/lists.c | 1 +
1 file changed, 1 insertion(+)
commit 7f032183dfd36c1f91d2400ceb5bbc90376a310c
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-14
Follow-up to arithmetic overflow fix
Check if nmemb is zero in p11_rpc_message_alloc_extra_array to avoid a
division by zero trap. Additionally, change the reallocarray
compatibility shim so that it won't assert when resizing an array to
zero, and add the same nmemb != 0 check there.
common/compat.c | 4 ++--
p11-kit/rpc-message.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 6c1c94bd2360f5778beb397ba5508d5084b7f0ee
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
Check for arithmetic overflows before allocating
p11-kit/iter.c | 4 ++--
p11-kit/lists.c | 2 ++
p11-kit/proxy.c | 2 +-
p11-kit/rpc-message.c | 13 +++++++++++++
p11-kit/rpc-message.h | 4 ++++
p11-kit/rpc-server.c | 8 ++++----
trust/index.c | 4 ++--
7 files changed, 28 insertions(+), 9 deletions(-)
commit 7625cfcebccf1c02d17e9295e1d883ea688ea264
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-07
Check attribute length against buffer size
If an attribute's length does not match the length of the byte array
inside it, one length was used for allocation, and the other was used
for memcpy. This additional check will instead return an error on
malformed messages.
p11-kit/rpc-message.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 69d751ca9df9ac101adfb1e5aa7e83e3358106ba
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-06
Fix bounds check in p11_rpc_buffer_get_byte_array
This bounds check should be using off, not *offset, because it has been
advanced four bytes from reading a uint32 earlier in the function.
Additionally, the pointer that is returned is computed using off, not
*offset.
p11-kit/rpc-message.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bb3a3cb1cb4ae8341fa1cf1cc4e9f282c7c74b76
Author: David Cook <divergentdave@gmail.com>
Date: 2020-11-06
Fix buffer overflow in log_token_info
The utcTime field in CK_TOKEN_INFO is not null terminated, so a length
must be provided when copying it. This call to p11_buffer_add with a
length of -1 was reading past the end of the string, and off the end of
the stack.
p11-kit/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ee45d7df8cbd28b1a5cc6304c7d420ca94afb145
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-28
common: Don't assume __STDC_VERSION__ is always defined
Old compilers may not define __STDC_VERSION__:
https://sourceforge.net/p/predef/wiki/Standards/
Reported by dirkf in:
https://github.com/p11-glue/p11-kit/issues/337
common/compat.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f60d22f8cadc4f9b40aa3ee00ab575a8f5a00f74
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-03
compat: getauxval: correct compiler macro for FreeBSD
It should be __FreeBSD__ instead of __FREEBSD__:
https://sourceforge.net/p/predef/wiki/OperatingSystems/
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 255a6a01f383db7c4c510f22c20db6e7011d38b1
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-03
compat: fdwalk: add guard for Linux specific local variables
common/compat.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit dfb85f5e8d84d3bd55d4a735aea2e642b8c00a5e
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-03
meson: Add missing libtasn1 dependency
trust/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1895415899d1a578f3e64682a8f1ce8a52a9394f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-12-02
travis: Add freebsd build
.travis.yml | 1 +
.travis/freebsd/after_failure.sh | 3 +++
.travis/freebsd/before_install.sh | 5 +++++
.travis/freebsd/script.sh | 6 ++++++
4 files changed, 15 insertions(+)
commit 7e7f5b1a02f7fc67313289bde347739ff5438c4a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-06
anchor: Prefer persistent format when storing anchor
When a new certificate is stored with "trust anchor --store" from a
.p11-kit file, the command treated it as a PEM file, while it should
preserve extra fields in the file.
trust/anchor.c | 7 ++++---
trust/test-extract.sh | 27 ++++++++++++++++++++++++---
2 files changed, 28 insertions(+), 6 deletions(-)
commit bd7702ff1b4e154e643a444746c5023fed6116ee
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-29
travis: Run "make check" along with "make distcheck" for coverage
.travis/autotools/script.sh | 5 +++++
1 file changed, 5 insertions(+)
commit 550bb23fc2edc9b5704ffd7d7bfd301627418ea4
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-29
travis: Use python3 as the default Python interpreter
.travis/autotools/after_success.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ea0528177b2a4faaa3b28f93e64162ead5d54ccd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-29
travis: Route to Ubuntu 20.04 base image
Fedora 33 image doesn't work well under the the default image based on
Ubuntu 16.04.
.travis.yml | 7 +++++++
1 file changed, 7 insertions(+)
commit 6ea0ff7be226b4b1cd0eef0a127d48298ead5393
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-07
meson: Set -fstack-protector for MinGW64 cross build
This fixes CI failures caused by:
https://sourceforge.net/p/mingw-w64/bugs/818/
build/cross_file_mingw64.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e1899c41220aa5a2dbb373d5ce740b25ef4fd384
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-27
meson: expand ternary operator in function call for compatibility
While the minimum version requirement of meson is 0.49, the current
meson.build causes the parser crash, because of the use of a ternary
operator inside a function call:
https://github.com/mesonbuild/meson/issues/5003
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit 8e58477c68c77ef2c29a3fc7d728220929c0996f
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-11-20
meson: Use custom_target for generating external XML entities
configure_file() adds a trailing newline, and thus the resulting
document contains unwanted spaces between the resolved entities and
the following text. Instead, use custom_target() along with 'echo -n'
to generate the XML entity files.
doc/manual/meson.build | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
commit 75fd5515553a299831099a0a5ec98afc441d0cf9
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2020-11-16
meson: Allow building manpages without gtk-doc
Fixes https://github.com/p11-glue/p11-kit/issues/331
doc/manual/meson.build | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
commit ce66cf00b6b207c1d452af23cb062ca0adf57dac
Author: Alexander Sosedkin <asosedkin@redhat.com>
Date: 2020-10-27
Rename is_path_component to is_path_separator
Thanks to Daiki Ueno for noticing the misnaming.
common/path.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
commit e5a1f444b7d299e77dd57862f3cc5783e697a10e
Author: Alexander Sosedkin <asosedkin@redhat.com>
Date: 2020-10-27
Use is_path_component in one more place
common/path.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1eac9a1c41828d5da4b640746e0002c7ab964e8e
Author: Alexander Sosedkin <asosedkin@redhat.com>
Date: 2020-10-27
Remove more duplicate separators in p11_path_build
Makes p11_path_build remove duplicate separators more thoroughly,
e.g., after a "" or in the first argument.
common/path.c | 26 +++++++++++++++++++-------
common/test-path.c | 22 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 7 deletions(-)
commit de661c41a1e7e52296c91b9caa0bff8e4885c751
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-10-22
common: Fix infloop in p11_path_build
If p11_path_build is called with 2 or more arguments and the non-first
argument is an empty string (""), it previously fell into an infloop.
Reported by Karel Srot.
common/path.c | 4 +++-
common/test-path.c | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
commit 47fabc2366d917e255241c41a6cfc179af372644
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-10-04
Use inclusive language on certificate distrust
bash-completion/trust | 2 +-
build/certs/Makefile | 2 +-
common/pkcs11x.h | 2 +-
doc/manual/p11-kit-devel.xml | 2 +-
doc/manual/p11-kit-trust.xml | 8 +--
doc/manual/trust.xml | 24 ++++-----
trust/builder.c | 6 +--
trust/enumerate.c | 60 ++++++++++-----------
trust/enumerate.h | 6 +--
trust/extract-openssl.c | 2 +-
trust/extract.c | 8 +--
.../input/{blacklist => blocklist}/self-server.der | Bin
trust/list.c | 6 +--
trust/oid.h | 11 ++--
trust/parser.c | 18 +++----
trust/parser.h | 2 +-
trust/test-enumerate.c | 6 +--
trust/test-extract.sh | 16 +++---
trust/test-openssl.c | 4 +-
trust/test-parser.c | 4 +-
trust/test-token.c | 16 +++---
trust/token.c | 16 +++---
22 files changed, 110 insertions(+), 111 deletions(-)
commit 0a1263a41d4c482f50aa5c4643f9de38fda44bbd
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-10-05
proxy: C_CloseAllSessions: Make sure that calloc args are non-zero
This prevents efence warning if either of the calloc arguments is
zero. While it is is safe on glibc systems, POSIX says the behavior
is implementation-defined.
Reported by Paul Wouters.
p11-kit/proxy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 08fcec713c1d3038f706d049910bd13a8c811fb5
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-10-05
build: Use calloc in a consistent manner
common/dict.c | 6 +++---
p11-kit/proxy.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
commit 565ba5d6de58d4b210435b786ae0d753e044901c
Author: John Hein <dkeabg7vp4@snkmail.com>
Date: 2020-09-23
meson: Allow override of default bashcompdir.
Fixes meson regression (issue #322). Pass -Dbashcompdir=/xxx to meson.
bash-completion/meson.build | 16 ++++++++++------
meson_options.txt | 4 ++++
2 files changed, 14 insertions(+), 6 deletions(-)
commit 56251aa50783cdd465877d28c8f017ae16c61f79
Author: Tavian Barnes <tavianator@tavianator.com>
Date: 2020-09-06
common: Check for a NULL locale before freeing it
If newlocale() fails, (locale_t) 0 ends up being passed to freelocale(),
resulting in a segfault when the library is unloaded.
common/library.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 2c40a4a55efa8c1bce0f7aadd5135be705565610
Author: Anders Kaseorg <andersk@mit.edu>
Date: 2020-08-30
p11_test_copy_setgid: Skip setgid tests on nosuid filesystems
Some build environments build packages from a build directory mounted
nosuid, causing p11_test_copy_setgid to fail. Skip the test in this
case.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
common/test.c | 8 ++++++++
1 file changed, 8 insertions(+)
commit 8b5a10e7ed74b6839e5e415d47b263d26c63e572
Author: Rosen Penev <rosenp@gmail.com>
Date: 2020-08-27
unix-peer: replace incorrect include1
Fixes musl warning:
warning: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Wcpp]
common/unix-peer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a26d0b052c32fbd9c7ef468bd4188fa8fa03499a
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-21
test-compat: Skip getprogname test if BUILDDIR contains a symlink
common/test-compat.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 7f59a79179b978e867c9def56475bfb877024312
Author: Xℹ Ruoyao <xry111@mengyan1223.wang>
Date: 2020-08-19
add trust-extract-compat into EXTRA-DIST
trust/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 1a21df391691d9a9c7b5ebc77022385f7feb266b
Author: Xℹ Ruoyao <xry111@mengyan1223.wang>
Date: 2020-08-19
meson: install trust-extract-compat
trust/meson.build | 3 +++
1 file changed, 3 insertions(+)
commit 49e9b47c9546525e29b25c707068770e12add45f
Author: Xℹ Ruoyao <xry111@mengyan1223.wang>
Date: 2020-08-19
rename trust-extract-compat.in to trust-extract-compat
There is no substitution in this file, so it's unnecessary to have a .in
file.
configure.ac | 1 -
trust/{trust-extract-compat.in => trust-extract-compat} | 0
2 files changed, 1 deletion(-)
commit fd8b56f3ee971f94dc6fc95411fc01e1c12153ab
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
autotools: Fix SUFFIXES usage
SUFFIXES must be defined in the top-level Makefile.am, when
non-recursive make is used.
Makefile.am | 2 ++
p11-kit/Makefile.am | 2 +-
trust/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
commit 3c1304caae967b7cca40aae70c47c7f5138ea945
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
Release 0.23.21
NEWS | 6 ++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
commit 43961d4e9bdceee241ce25877aad327d4daa5a10
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
packit: Adjust to doing propose-update through /packit comment
.packit.yaml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
commit b40f27af28406810d0f42a29b98086fb02173f0c
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
README.md: Fix whitespace problem
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 76f94b4ad111c4150a16d36aafd30ab8aa274a68
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
conf: Add internal option to forcibly enable user config
Some tests need user config enabled, though it is disabled under
certain conditions (e.g., running as root) and makes those tests fail.
p11-kit/conf.c | 5 ++++-
p11-kit/test-conf.c | 7 +++++++
p11-kit/test-deprecated.c | 4 ++++
p11-kit/test-modules.c | 4 ++++
p11-kit/test-transport.c | 4 ++++
5 files changed, 23 insertions(+), 1 deletion(-)
commit 46c2ff05bf92e73735575aeb8bb9b9bec545f33c
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
SECURITY.md: Split from README.md
README.md | 17 +----------------
SECURITY.md | 5 +++++
2 files changed, 6 insertions(+), 16 deletions(-)
commit da01718924623c1502eb45b7c946d6df798ea1be
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-18
README.md: Add LGTM badges
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit adbb94ea3ec3c39b71c05eff8ef86cc85a075955
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-15
trust: Remove generated *.asn.h files from repository
.gitignore | 1 +
configure.ac | 1 +
trust/Makefile.am | 25 ++--
trust/basic.asn.h | 13 --
trust/meson.build | 43 +++---
trust/openssl.asn.h | 26 ----
trust/pkix.asn.h | 366 ----------------------------------------------------
7 files changed, 45 insertions(+), 430 deletions(-)
commit 015fe112def654cac562b85ca864dc279ca4e897
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-15
uri: Limit characters in vendor query attribute names
p11-kit/uri.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 6f58217fd0590a52137b0d350d07cb4408a1bd77
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-15
compat: Define static assertion macro
common/compat.h | 7 +++++++
p11-kit/rpc-message.c | 8 ++------
2 files changed, 9 insertions(+), 6 deletions(-)
commit 4e597e1858a3842798e8400eb2ac886612c1c6bf
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-14
rpc-transport: Remove pointless FIXME comments
Those actually shouldn't be closed.
p11-kit/rpc-transport.c | 2 --
1 file changed, 2 deletions(-)
commit d3dc234ce2ff08d0d7f29b4c464fb5a3406c341d
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-14
trust: p11_index_snapshot: Remove redundant integer range check
trust/index.c | 3 ---
1 file changed, 3 deletions(-)
commit 4e9ca11deaab88f1297c812af55dfb0036d1e207
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-14
build: Add header guards
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/init.h | 5 +++++
1 file changed, 5 insertions(+)
commit a88e7c1cc9b23f1310f3dd1a6922e270aed524eb
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-14
common/frob-getprogname: Avoid shadowing function parameter
Signed-off-by: Daiki Ueno <ueno@gnu.org>
common/frob-getprogname.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit d70d572610cd3ec7e246e898e93300615a02b267
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-14
server: Avoid shadowing global variable
p11-kit/server.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
commit 82374159ca3a5c0c252b2862a32dd96baeee1812
Author: David Halls <dahalls@gmail.com>
Date: 2019-12-14
If server returns already initialized, don't mark as not initialized
p11-kit/rpc-client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 15f15549bf41dfe665583d4c1fe316a524939075
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-02
common: Get program name based on executable path if possible
Some programs (e.g., Chromium) pack command line arguments into argv[0].
Check if it is the case by reading /proc/self/exe and extract the
program name.
Logic borrowed from:
<https://github.com/mesa3d/mesa/commit/759b94038987bb983398cd4b1d2cb1c8f79817a9>.
.gitignore | 1 +
common/Makefile.am | 7 +++
common/compat.c | 29 +++++++++++
common/frob-getprogname.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++
common/meson.build | 5 ++
common/test-compat.c | 15 ++++++
6 files changed, 177 insertions(+)
commit d10c5a35695df82f81f22c1e7d026be07c21aec5
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-02
trust: Avoid uninitialized variable in session_for_store_on_module
This suppresses the cppcheck error:
trust/anchor.c:243,error,uninitvar,Uninitialized variable: count
Also fixes calloc invocation when the slot count is 0.
trust/anchor.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit e4f65d88076bf915dd969efd03b7d994196b7fa9
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-02
test: Avoid uninitialized variable
This suppresses the cppcheck error:
p11-kit/test-deprecated.c:481,error,uninitvar,Uninitialized variable: manufacturerID
p11-kit/test-deprecated.c | 1 +
1 file changed, 1 insertion(+)
commit 5b6c66ec1121527a5db4339ff509a8fe6fdbc262
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-02
mock: Avoid uninitialized variable in test_find_objects
This suppresses the cppcheck errors:
p11-kit/test-mock.c:769,error,uninitvar,Uninitialized variable: count
p11-kit/test-mock.c:776,error,uninitvar,Uninitialized variable: count
p11-kit/test-mock.c:783,error,uninitvar,Uninitialized variable: count
p11-kit/test-mock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6242c67ed70ee95174267259ca804fd671725d91
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-08-02
constants: Tighten handling of failure case in lookup_info
This suppresses the cppcheck error:
common/constants.c:649,error,invalidFunctionArg,Invalid bsearch() argument nr 3. The value is -1 but the valid values are '0:'.
common/constants.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 5e98a5471fa9cf136e092c279c72ff53ddebf76d
Author: Kai Takahashi <www.carrotsoft@gmail.com>
Date: 2020-08-02
Avoid using setenv() for MinGW users.
Signed-off-by: Kai Takahashi <www.carrotsoft@gmail.com>
common/tool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 714b216bbbaecf188685dddd98dd184e6c2721f4
Author: Albert Chin-A-Young <china@thewrittenword.com>
Date: 2020-07-25
p11-kit/modules.c: Avoid passing 0 as first argument to calloc().
Solves an issue #303 for AIX.
p11-kit/modules.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7f5ef7c04a24ede94a31a7e7820d9d03b9522bd5
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-06-12
anchor: Exit with non-zero code, if any error occurs
Suggested by Nikos Mavrogiannopoulos in:
https://github.com/p11-glue/p11-kit/issues/300
trust/anchor.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
commit 51cd2fdd844772eae874e1d6060a8cae6ad15760
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-06-12
tool: Don't override P11_KIT_DEBUG if it is already set
common/tool.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit a9e5fe3968759f4b4e7948c231917ffda18f0c7b
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-06-12
tool: Print messages by default
common/tool.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 71fdb9f5c4362c00bd9684793775f8ccc7ba6166
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-06-12
debug: Remove unused debug_inited flag
common/debug.c | 2 --
1 file changed, 2 deletions(-)
commit 56be8eae5cc337659eaddb07c502e901be8db203
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-06-12
meson: Fix typo
doc/manual/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 47e0c1fec418df1bbf2a056f1e983b64e3e23df0
Author: Daiki Ueno <ueno@gnu.org>
Date: 2020-05-30
trust/*.asn: Drop standard types
trust/basic.asn.h | 2 +-
trust/openssl.asn | 3 --
trust/openssl.asn.h | 8 ++---
trust/pkix.asn | 26 --------------
trust/pkix.asn.h | 102 ++++++++++++++++------------------------------------
5 files changed, 34 insertions(+), 107 deletions(-)
commit adf2685b23b8a631e8092aaf707cd1bcf7b230bb
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-05-17
README.md: Fix typo
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7eb041e573a5dd55cea97427ab1807772c0a7c83
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-05-17
README.md: Revamp and add build instruction
Also mention the required options for local installation.
Suggested by Andrew Johnson in:
https://github.com/p11-glue/p11-kit/issues/295
README.md | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
commit 4ea7cf7e819bbf8415a2aad2c99e7aa0f7fa143d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-05-17
meson: Add option to control bash-completion installation
bash-completion/meson.build | 2 +-
meson_options.txt | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
commit e0053798510a56057b7a77bb3c59e68725888200
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-04-13
test-token: Check if the path is actually writable
Instead of assuming a normal user cannot write to "/", this creates an
unwritable directly and checks if it is writable; otherwise the test
case is skipped.
Reported by Jeffrey Walton in:
https://github.com/p11-glue/p11-kit/issues/288
trust/test-token.c | 63 ++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 49 insertions(+), 14 deletions(-)
commit c1c71b03e08ffb9384438e7f94b1b8f699dce2cd
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-04-13
test: Make p11_test_{skip,todo} actually work
common/test.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
commit 825fd4e4526589eb73a54ada18127196fb65fde3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-04-13
meson: Add option to disable building test programs
Suggested by Daniel Engberg in:
https://github.com/p11-glue/p11-kit/issues/285
common/meson.build | 88 +++++++++---------
meson_options.txt | 4 +
p11-kit/meson.build | 252 +++++++++++++++++++++++++++-------------------------
trust/meson.build | 148 +++++++++++++++---------------
4 files changed, 256 insertions(+), 236 deletions(-)
commit 3de74dc6d916ce3dd2f76f0403be189387fe4d89
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-04-13
meson: Add option to disable NLS support
Suggested by Daniel Engberg in:
https://github.com/p11-glue/p11-kit/issues/284
meson.build | 4 +++-
meson_options.txt | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
commit 99aa8329841b986380cc4f515d57f118f40158c4
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-04-13
test-rpc: Suppress compiler warning on ILP32 platforms
On ILP32 platforms CK_ULONG is 32-bit and 64-bit values are truncated.
This patch determins the usable value from SIZEOF_UNSIGNED_LONG.
Also, for consistency, use UINTxx_MAX for other accessors.
Reported by Jeffrey Walton in:
https://github.com/p11-glue/p11-kit/issues/289
p11-kit/test-rpc.c | 47 ++++++++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 19 deletions(-)
commit 3eb79b75c2ee9870352fe4acc1ef6c8783364800
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-02-07
rpc: Add missing null checks in attribute value serializers
To get the length of an attribute value, the client calls
C_GetAttributeValue with attr->pValue set to NULL and attr->ulValueLen
set to -1. In the RPC level, this is already indicated with a
'validity' flag, but there were a couple of places where attr->pValue
is non-NULL.
This was uncovered by:
https://bugzilla.redhat.com/show_bug.cgi?id=1766340
p11-kit/rpc-message.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
commit 04cbdcf546f88d666fcb214ce42e777fa7840732
Author: Alvin Chen <sonoma001@gmail.com>
Date: 2020-03-02
Update pkcs11 header to allow TPM2-PKCS11 to compile
common/pkcs11.h | 2 ++
1 file changed, 2 insertions(+)
commit 51c0781410cb1292d7efbafee23ee5876c9bd2e4
Author: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: 2020-02-18
test-proxy: Add test for slot ID reuse
The test covers a case where duplicate slots IDs were assigned to two
different slots in the mapping.
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
p11-kit/Makefile.am | 7 ++-
p11-kit/meson.build | 3 +-
p11-kit/mock-module-ep8.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/test-proxy.c | 39 ++++++++++++++++
4 files changed, 157 insertions(+), 2 deletions(-)
commit c8f8053edc9098fdb36fbb34165b8d92ed596798
Author: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: 2020-02-17
proxy: Fix slot ID reuse, avoiding duplicating IDs
Previously, when re-mapping the slots, a slot ID could be assigned to
more than one device, causing errors when searching for the right
mapping (it would use the first found).
Also assign new slot IDs for new found slots, avoiding previously used
slot IDs. The last assigned slot ID is stored in the proxy structure
in a new added field last_id.
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
p11-kit/proxy.c | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 37 insertions(+), 19 deletions(-)
commit da22fd9f2a54d707db7f3021f22416b4af496ae8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-30
packit: Enable Fedora package building with Packit
.packit.yaml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
commit 762cdaa2cd5c5ec09cc844f9a6bdc551c7f6c8ed
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-29
Release 0.23.20
NEWS | 3 +++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
commit ab180d64b909594bdafc9596f67a1913275c6474
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-29
Revert "Fix RPC calls: ATTRIBUTE buf not null but length 0"
This reverts commit 65409c0ebd5d9a4aaf55254256dcc878862a0be1.
p11-kit/rpc-message.c | 8 +-------
p11-kit/rpc-server.c | 22 +++-------------------
2 files changed, 4 insertions(+), 26 deletions(-)
commit 17a26f0948944635453a54d44c2565ed7ba91a14
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-29
Revert "Fix RPC calls: BYTE buffer not null and length 0"
This reverts commit 8cb21a6a09d18156c9002b97687e5ac0bfa0fc92.
p11-kit/rpc-client.c | 2 +-
p11-kit/rpc-message.c | 6 ++----
p11-kit/rpc-message.h | 3 +--
p11-kit/rpc-server.c | 7 ++-----
4 files changed, 6 insertions(+), 12 deletions(-)
commit 83aaa2200bfa141b0c9e1c4f5af98252f8e826cc
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-29
Revert "Fix C_GetSlotList() when length is 0"
This reverts commit 1ede9b8d33c4bc9a4194ffca22ac6d7351f6bcf5.
It turned out that this breaks compatibility of the RPC protocol. The
right fix to the original issue would be probably to add a new call ID
associated with a different signature and add a fallback mechanism in
both client and server.
p11-kit/rpc-client.c | 2 +-
p11-kit/rpc-message.c | 6 ++----
p11-kit/rpc-message.h | 3 +--
p11-kit/rpc-server.c | 7 ++-----
p11-kit/test-server.c | 36 ------------------------------------
5 files changed, 6 insertions(+), 48 deletions(-)
commit 69a420aaa70af5b89508b5140edb0ee4e166605b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
Release 0.23.19
NEWS | 9 +++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
commit 251dfdfd765e709b7d54420c685e19f70a5e9803
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-22
travis: Tighten autotools build steps
.travis/autotools/script.sh | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
commit e9dbeeea96b0b709631d1b6d62f9877f4872993b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-22
travis: Do 'make distcheck' in autotools build
.travis/autotools/script.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2a1ee21ca31a62274e0932572f972bf3340f8bde
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
build: Add --with-bash-completion configure option
This is needed for 'make distcheck' to not install those files in the
system locations.
Makefile.am | 1 +
configure.ac | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
commit cee7c2ad81d21795783ec28a67247cff740de2ce
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
build: Only distribute XZ-compressed tarballs
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5092f8dd5463b89642e29ca5ae7ea08aa30d5d66
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
build: Add more files to .gitignore
.gitignore | 2 ++
1 file changed, 2 insertions(+)
commit a96af650e1ac2f5faecc9354ac30d128a7e93b9f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
meson: Expose only C_GetFunctionList from the mock modules
p11-kit/meson.build | 4 ++++
1 file changed, 4 insertions(+)
commit ba3c7d16760d177be43960c9eb9572817c60c4df
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-21
mock: Handle memory allocation error in C_Initialize
common/mock.c | 4 ++++
1 file changed, 4 insertions(+)
commit 62b09608e3a311c8b8ae924805f936f8af593bfa
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-15
meson: Use cc.has_type for types instead of cc.has_header_symbol
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 45cd66e3a16f0102a50f33ebb4a58aac09f40f92
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-15
meson: Check if <stdbool.h> exists
meson.build | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 5fe875dc598e2dc50ba8e888099c116fe12999d3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-15
meson: Check program_invocation_short_name declaration
Pointed by Rosen Penev in #268.
meson.build | 5 +++++
1 file changed, 5 insertions(+)
commit 869b657c7bfbd2f91331d5aabcf572cba6043d37
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-15
meson: Check endianness
meson.build | 4 ++++
1 file changed, 4 insertions(+)
commit 1f8d523e5db688deff13329b4cba1dd6181d76a3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-15
build: Fix type mismatch in reallocarray usage
common/attrs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1def8077a2bc1fc2a6bd3685a9d94a9a51f40e23
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-10-31
trust: Support CKA_NSS_{SERVER,EMAIL}_DISTRUST_AFTER
These new attributes are introduced in:
https://bugzilla.mozilla.org/show_bug.cgi?id=1465613
The value of the attribute can be either false (represented as a
single octed "\x00"), or a UTCTime in a restricted form (i.e.,
"YYMMDDHHMMSSZ"). For future proof, we also support GeneralizedTime
in the form "YYYYMMDDHHMMSSZ".
common/constants.c | 2 ++
common/pkcs11x.h | 2 ++
trust/builder.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/test-builder.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 157 insertions(+)
commit e8b453383ace97fc1adfc213dc718e7b62fafd96
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-14
build: Remove auto-generated gettext files from repository
po/en@boldquot.header | 25 -------------------------
po/en@quot.header | 22 ----------------------
po/insert-header.sin | 23 -----------------------
po/remove-potcdate.sin | 19 -------------------
4 files changed, 89 deletions(-)
commit 8d92053df8a2bfed89a6f3e835386e13c7f95b61
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-14
build: Use AM_GNU_GETTEXT_REQUIRE_VERSION
AM_GNU_GETTEXT_REQUIRE_VERSION was introduced a while back to instruct
autopoint to pull the latest version of gettext infrastructure. Use
it instead of hacking around gettextize call in autogen.sh.
autogen.sh | 13 -------------
configure.ac | 4 ++++
2 files changed, 4 insertions(+), 13 deletions(-)
commit 5bb71e914532b8350dfc14697c4fa89e714e5812
Author: David Woodhouse <dwmw@amazon.co.uk>
Date: 2020-01-06
rpc: Add vsock transport
This allows PKCS#11 remoting between virtual machines, so a software
token can be isolated into a microVM.
common/Makefile.am | 1 +
common/meson.build | 3 +-
common/vsock.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++
common/vsock.h | 46 ++++++++++++++++++
configure.ac | 15 ++++++
meson.build | 9 ++++
p11-kit/rpc-transport.c | 97 ++++++++++++++++++++++++++++++++++++++
p11-kit/server.c | 118 ++++++++++++++++++++++++++++++++++++++++------
8 files changed, 395 insertions(+), 16 deletions(-)
commit 877de5fadaf0067272e8d0eb24893d7c823afe08
Author: David Woodhouse <dwmw@amazon.co.uk>
Date: 2020-01-06
rpc: Check for socket init failure
In some cases, rpc_unix_init() or rpc_exec_init() can return NULL but
p11_rpc_transport_new() doesn't check and may dereference it.
p11-kit/rpc-transport.c | 2 ++
1 file changed, 2 insertions(+)
commit 96af147637f0dc10792c3abdcec1894c361229da
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-09
build: Suppress cppcheck false-positive on tracking array length
p11-kit/proxy.c | 2 ++
1 file changed, 2 insertions(+)
commit e931efd17950786ee61cbfc70ddf94d02ae473ba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2020-01-08
build: Fix realloc usage
As realloc() doesn't touch the original memory block, we need to use a
local variable to avoid potential memory leak in failure cases.
Pointed by David Woodhouse.
common/attrs.c | 6 ++++--
p11-kit/filter.c | 9 +++++----
p11-kit/iter.c | 20 ++++++++++++++------
p11-kit/proxy.c | 7 +++++--
trust/index.c | 12 ++++++++++--
5 files changed, 38 insertions(+), 16 deletions(-)
commit 6563ad8ececec05f2b6269b509d4e12c07d2a87e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-10-26
CONTRIBUTING.md: Mention contribution rules and coding style
CONTRIBUTING.md | 35 +++++++++++++++++++++++++++++++++++
HACKING | 16 ----------------
Makefile.am | 2 +-
3 files changed, 36 insertions(+), 17 deletions(-)
commit 65409c0ebd5d9a4aaf55254256dcc878862a0be1
Author: Vincent JARDIN <vjardin@free.fr>
Date: 2019-10-22
Fix RPC calls: ATTRIBUTE buf not null but length 0
Let's add a support for cases when the buffer != NULL but the
length is 0. According to Oasis, buffer = NULL and length = 0
means a query of the length so the subsequent calls with a
buffer != NULL should fill then buffer when length is long enough.
If not, according to Oasis, one should get a CKR_BUFFER_TOO_SMALL.
See the previous commit for IN_ULONG_BUFFER(). This patch is
follow a similar design pattern.
Fix: issue #257
p11-kit/rpc-message.c | 8 +++++++-
p11-kit/rpc-server.c | 22 +++++++++++++++++++---
2 files changed, 26 insertions(+), 4 deletions(-)
commit 8cb21a6a09d18156c9002b97687e5ac0bfa0fc92
Author: Vincent JARDIN <vjardin@free.fr>
Date: 2019-10-22
Fix RPC calls: BYTE buffer not null and length 0
Let's add a support for cases when the buffer != NULL but the
length is 0. According to Oasis, buffer = NULL and length = 0
means a query of the length so the subsequent calls with a
buffer != NULL should fill buffer when length is long enough.
If not, according to Oasis, one should get a CKR_BUFFER_TOO_SMALL.
This current fix is for IN_BYTE_BUFFER(), same
for IN_ATTRIBUTE_BUFFER().
See the previous commit for IN_ULONG_BUFFER(). This patch is
strictly using the same design pattern.
Fix: issue #257
Suggested-by: Daiki Ueno <dueno@redhat.com>
p11-kit/rpc-client.c | 2 +-
p11-kit/rpc-message.c | 6 ++++--
p11-kit/rpc-message.h | 3 ++-
p11-kit/rpc-server.c | 7 +++++--
4 files changed, 12 insertions(+), 6 deletions(-)
commit 1ede9b8d33c4bc9a4194ffca22ac6d7351f6bcf5
Author: Vincent JARDIN <vjardin@free.fr>
Date: 2019-10-21
Fix C_GetSlotList() when length is 0
Let's add a support for cases when the buffer != NULL but the
length is 0. According to Oasis, buffer = NULL and length = 0
means a query of the length so the subsequent calls with a
buffer != NULL should fill buffer when length is long enough.
If not, according to Oasis, one should get a CKR_BUFFER_TOO_SMALL.
This current fix is for IN_ULONG_BUFFER(), same
should be applied for IN_BYTE_BUFFER() and for IN_ATTRIBUTE_BUFFER().
Include a test_no_slots()
Fix: issue #257
Suggested-by: Daiki Ueno <dueno@redhat.com>
p11-kit/rpc-client.c | 2 +-
p11-kit/rpc-message.c | 6 ++++--
p11-kit/rpc-message.h | 3 ++-
p11-kit/rpc-server.c | 7 +++++--
p11-kit/test-server.c | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 6 deletions(-)
commit 9763fc8edcc5dd41e07ddf068dce6bc429dfe6b6
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2019-10-23
test-proxy: Implement reproducer for bad prefix list matching
p11-kit/test-proxy.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 298ad811540c538fea1906528fe8cf8a6784e5ee
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2019-10-23
modules: Implement correct search in list
The current version of matching was failing, when the list contained
also a searched string with some suffix, for example, when we ran from
p11-kit and the p11-kit-proxy was first in the list and p11-kit later,
it was not matched, because the test did not find a separator after
the first match, decided that it does not match and did not try further.
example program p11-kit
example enable-in: p11-kit-proxy,p11-kit
p11-kit/modules.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
commit 7c94eab51d08650eaa66184344325d42e812973c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-10-23
autotools: Fix bash-completion installation
Makefile.am | 13 ++++---------
configure.ac | 5 ++++-
p11-kit/Makefile.am | 4 ++++
trust/Makefile.am | 4 ++++
4 files changed, 16 insertions(+), 10 deletions(-)
commit ef2716d18e1098effb8f3a90653c6264b2fec426
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2019-10-22
Install bash completion in the CI
.travis/autotools/before_install.sh | 2 +-
.travis/cppcheck/before_install.sh | 2 +-
.travis/linux/before_install.sh | 2 +-
.travis/osx/before_install.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 387594893ee8d09267a7b788f3dae6905093d3c9
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2019-10-21
Add simple bash completion for provided commands
Makefile.am | 8 ++++++
bash-completion/meson.build | 11 ++++++++
bash-completion/p11-kit | 19 +++++++++++++
bash-completion/trust | 67 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 7 +++++
meson.build | 1 +
6 files changed, 113 insertions(+)
commit b879b9b8395d0a99dbc9b8ae8057dc84bdd551e6
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2019-10-22
configure: Fix typo to avoid errors during configure
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6b33efaa82848bac7fd73888963a106cf4c03151
Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: 2019-10-07
common: add Russian PKCS#11 extensions to pkcs11x.h header
Add values defined to support Russian GOST cryptography to pkcs11x.h
header.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
common/pkcs11x.h | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
commit a92894c80d880b6047327a276395b1f88fc733ee
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-30
autotools: Add more files from meson build in distribution
Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit b0ebe7555c291808db29377ba79cb8326301f0a6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-30
autotools: Add more files from meson build in distribution
p11-kit/Makefile.am | 7 +++++++
1 file changed, 7 insertions(+)
commit 3530d4946f9b9233bb0c132f3eda77c5f593fe9a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-30
build: Fix 'make distcheck'
Makefile.am | 3 ++-
doc/manual/Makefile.am | 1 -
p11-kit/Makefile.am | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
commit 25df8dfd2fac77d8c00d87a114d6d89dd945055f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-30
Release 0.23.18
NEWS | 5 +++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
commit fde84c52f4ffd0b274ce92e5f935060e86f0a5f7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-25
rpc: Allow empty CK_DATE value
Unlike other data types, CK_DATE value may be empty (and that is the
default). Treat it as a valid value and serialize/deserialize
accordingly.
Reported by Vincent JARDIN in:
https://github.com/p11-glue/p11-kit/issues/244
p11-kit/rpc-message.c | 23 +++++++++++++----------
p11-kit/test-rpc.c | 23 +++++++++++++++++++++++
2 files changed, 36 insertions(+), 10 deletions(-)
commit df2b7b0a3c1ad3c6f54ff6c84ecc1f04976e65f7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-18
build: Fix undefined behavior in left shift
Spotted by UBSan.
p11-kit/rpc-message.c | 2 +-
trust/utf8.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 94179adeebb24f390cad6abed1f1f8f89c41f451
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-11
autotools: Use symbol versioning if possible
The meson build already using it for:
https://github.com/mesonbuild/meson/issues/3047
Suggested by Jan Alexander Steffens
configure.ac | 3 +++
p11-kit/Makefile.am | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
commit 783bfcb40bafc7e2b64ec80a99add15112a2e8f9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-11
build: Import ld-version-script.m4 from gnulib
.gitignore | 1 +
build/m4/ld-version-script.m4 | 48 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
commit 5240551119b99618aa4de95b88c1c2076d7ec87a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-10
build: Add meson files in autotools distribution
Makefile.am | 2 +-
common/Makefile.am | 2 ++
doc/manual/Makefile.am | 1 +
p11-kit/Makefile.am | 1 +
trust/Makefile.am | 3 ++-
5 files changed, 7 insertions(+), 2 deletions(-)
commit 201e9d838befb1e4641228a79212a37c81774e8f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-13
travis: Run ninja install as root
This is to avoid meson calling pkexec, which doesn't work inside docker.
.travis/linux/script.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 17b2edb1354c5d5080172af45ce55408c5e51d59
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: Add missing prefix to system path defines
p11-kit/meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 64a7722aeab2eafcbc57c9145b3fb556e4b1a61b
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: Install p11-kit-server units
p11-kit/meson.build | 11 +++++++++++
1 file changed, 11 insertions(+)
commit e5b0dfc2aca0d22c123a85c6cab96772af1f85fb
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: Build and install man pages
doc/manual/meson.build | 185 +++++++++++++++++++++++++++++++------------------
meson.build | 5 +-
meson_options.txt | 4 ++
3 files changed, 122 insertions(+), 72 deletions(-)
commit 901749a2039ce5b0e6388295d364b22b80c37e58
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: Don't prefix p11_user_config
p11-kit/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b1d1fb011fad3e5b21665e6767fc267e0241ecf0
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: PKCS#11 modules should only export C_GetFunctionList
p11-kit/meson.build | 10 ++++++++++
p11-kit/p11-module.def | 2 ++
p11-kit/p11-module.map | 6 ++++++
trust/meson.build | 6 +++++-
4 files changed, 23 insertions(+), 1 deletion(-)
commit cc38f6aa61f6122f182d7099f5c88548b36a0843
Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Date: 2019-09-10
meson: Install p11-kit-client module
p11-kit/meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit f2ee0a01272f4bbd018fb438344615cca8a74185
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-09
meson: Fix dictionary syntax
Reported by Jan Alexander Steffens.
doc/manual/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit f00183944fad943216ac5842f6b23ab5c4149e50
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-09
Release 0.23.17
NEWS | 8 ++++++++
configure.ac | 2 +-
meson.build | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
commit 2dea838a5dc284db29b0f8558cd3e1f1822f47ed
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-09
uri: Supress cppcheck false-positive
p11-kit/uri.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 8db6d7eee38bbf1f511da6128d108a62833f84d0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-09
uri: Check return value of insert_attribute
p11-kit/uri.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit d6c88b4735284394e73ad0228559fc8aca948318
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-09-09
meson: Update project version
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ead7a4a28f0505aa5602877538ef8be9970245b2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-07-07
build: Fix typo in checking program_invocation_short_name decl
The decl should be in errno.h, not error.h.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 99cdf3dc86ec7148e08351b63d8ee5f2f2a7f4d3
Author: Rosen Penev <rosenp@gmail.com>
Date: 2019-07-01
common: Fix uClibc-ng compilation
program_invocation_short_name is const under uClibc-ng.
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5a89453fafab796d33c37dd6861c102fc28ebde2
Author: Alon Bar-Lev <alon.barlev@gmail.com>
Date: 2019-07-01
trust: do not allow daylight to invalidate date validation
Issue: 235
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
trust/builder.c | 1 +
1 file changed, 1 insertion(+)
commit 787888e181543f5a85eb69d6a3caf14f9a4262b2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-19
build: Declare dependency chain between static libs in common
In common/ there are sub-libraries namely libp11-common.a,
libp11-library.a, libp11-tool.a, and libp11-test.a.
All the latter 3 libs use the symbols from libp11-common.a, it would
make sense to declare a dependency against it.
common/meson.build | 17 ++++++-----------
p11-kit/meson.build | 22 ++++++++++------------
trust/meson.build | 10 +++-------
3 files changed, 19 insertions(+), 30 deletions(-)
commit eb5eb7aea7fc41a2c15d853cd57c7c030644f4ee
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-19
build: Make threads dependency more explicit
common/meson.build | 6 ++++--
meson.build | 12 ++++--------
p11-kit/meson.build | 4 ++--
3 files changed, 10 insertions(+), 12 deletions(-)
commit daf1a84de39c4cdbd308c6a0b80b437689a222c7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-02
.travis.yml: Use meson for building
.travis.yml | 12 ++++++------
.travis/autotools/after_failure.sh | 3 +++
.travis/autotools/after_success.sh | 13 +++++++++++++
.travis/autotools/before_install.sh | 9 +++++++++
.travis/autotools/install.sh | 14 ++++++++++++++
.travis/autotools/script.sh | 12 ++++++++++++
.travis/linux/after_failure.sh | 2 +-
.travis/linux/after_success.sh | 10 ++++------
.travis/linux/before_install.sh | 4 +++-
.travis/linux/script.sh | 33 +++++++++++++++++++++++----------
build/cross_file_mingw64.txt | 18 ++++++++++++++++++
11 files changed, 106 insertions(+), 24 deletions(-)
commit 4f956698b64ac6eb8e5e8b7d143ceb11f1133814
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-15
build: Add meson build support
This adds support for meson as an alternative build system.
.dir-locals.el | 3 +-
common/meson.build | 99 ++++++++++++
doc/manual/meson.build | 75 +++++++++
doc/manual/sysdir.xml.in | 1 +
doc/manual/userdir.xml.in | 1 +
doc/manual/version.xml.in | 1 +
meson.build | 368 ++++++++++++++++++++++++++++++++++++++++++
meson_options.txt | 47 ++++++
p11-kit/gen-pkcs11-gnu.sh | 16 ++
p11-kit/gen-virtual-fixed.sh | 28 ++++
p11-kit/libp11-kit-0.dll.def | 101 ++++++++++++
p11-kit/libp11-kit.map | 105 ++++++++++++
p11-kit/meson.build | 299 ++++++++++++++++++++++++++++++++++
p11-kit/meson_post_install.sh | 15 ++
p11-kit/pkcs11-gnu.c | 3 +
po/meson.build | 1 +
trust/meson.build | 162 +++++++++++++++++++
17 files changed, 1324 insertions(+), 1 deletion(-)
commit 411a7a6d31cd5584ff9837260d77d8c306d3b557
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-01
trust: Fix mismatched return values
trust/pem.c | 2 +-
trust/x509.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 58481dbb0b0ee1384e62878283a398d96e0ff5f2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-02
po: Remove en@{,bold}quot from LINGUAS
po/LINGUAS | 2 --
1 file changed, 2 deletions(-)
commit cbdbfaaf255083091decc280058caa87db19aeb9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-01
build: Don't hardcode module path
Makefile.am | 4 +++-
p11-kit/Makefile.am | 12 ++++++++----
p11-kit/test-deprecated.c | 2 +-
p11-kit/test-init.c | 2 +-
p11-kit/test-server.c | 12 ++++++------
p11-kit/test-server.sh | 4 +++-
p11-kit/test-transport.c | 6 +++---
7 files changed, 25 insertions(+), 17 deletions(-)
commit 084347319f6e832ec2c36d7b27a64c8f2614f084
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-01
build: Move check_PROGRAMS into subdirectories
.gitignore | 12 ++++++------
common/Makefile.am | 12 ++++++------
common/test-compat.c | 4 ++--
p11-kit/Makefile.am | 32 ++++++++++++++++----------------
p11-kit/test-conf.c | 2 +-
p11-kit/test-messages.sh | 2 +-
p11-kit/test-server.c | 4 ++--
p11-kit/test-server.sh | 4 ++--
p11-kit/test-transport.c | 6 +++---
9 files changed, 39 insertions(+), 39 deletions(-)
commit 6bebd5747aa49d4a124d23d4967f65a771799fe5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-01
tests: Add tmpdir argument to p11_test_copy_setgid
To prevent BUILDDIR being embedded in the library.
common/test-compat.c | 4 ++--
common/test.c | 7 +++++--
common/test.h | 3 ++-
p11-kit/test-conf.c | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
commit 51382cd59c89e862443421a9d697a709f2244f36
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-16
tests: Fix memleaks in test-jks.c
trust/test-jks.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
commit 9c2022d292c00ccbe2413b53b7c91cf4ba4d7c14
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-03
tests: Skip tests calling getauxval(AT_SECURE) if binary is on /tmp
common/test-compat.c | 5 +++--
p11-kit/test-conf.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
commit fd908a787cc868043067f5fab492f8e05b6d99ce
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-16
tests: Fix temp file permission before deleting
On mingw64/wine, unlink fails if the file has no write bit.
trust/test-module.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
commit 2b3581c234f0097a2598395d1e0012b4ddd9a5ba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-17
tests: Don't assume / is not writable on Windows in test-token.c
trust/test-token.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
commit 6708ccf6126734b4d98cc849bc4542c45ffce191
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-15
conf: Skip root UID check on Windows
p11-kit/conf.c | 2 ++
1 file changed, 2 insertions(+)
commit 1e8ca781b983cb31d62e21a3a61f25be1fcc694f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-20
virtual: Rename virtual-fixed.c to virtual-fixed-generated.h
Previously the generated .c file was included in another source file,
which is not supported in some build systems (e.g., meson).
.gitignore | 2 +-
.travis/linux/after_success.sh | 2 +-
p11-kit/Makefile.am | 6 +++---
p11-kit/virtual.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
commit 045d7546fc317deefc2d84d524a211ce6ab4869b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-03
common: Make issetugid check simpler
common/compat.c | 7 ++-----
configure.ac | 16 +---------------
2 files changed, 3 insertions(+), 20 deletions(-)
commit bbb7f046ff430d33267487cb6f8a0e24d2eab832
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-06-02
common: Fix vasprintf emulation
va_list must be saved when calling vsnprintf() in a loop.
common/compat.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 5fc2d67b5ebb3daddb350d7ac60ede74dd99fcc6
Author: Simon Haggett <simon.haggett@gmail.com>
Date: 2019-06-13
rpc: On UNIX wait on condition variable instead of FD if header is for a different thread.
If rpc_socket_read() receives a header for a different thread, it tries to yield by
releasing the read mutex and waiting on the socket's read FD. On Linux systems, this has
been observed to cause a performance problem in cases where multiple threads are being
used. Threads expecting a different header can rapidly unlock and relock the read mutex,
as they resume when sock->read_code hasn't changed. This can result in contention on the
read mutex, which delays the thread that is expecting to consume the header.
This fix updates rpc_socket_read() on UNIX to wait on a condition variable instead of the
socket's read FD. The condition variable is signalled when sock->read_code changes. This
allows waiting threads to only resume once the header and payload have been consumed by
their target thread. This fix only targets UNIX platforms, as the Windows version that
p11-kit targets by default (Windows 2000) does not provide support for condition
variables.
Signed-off-by: Simon Haggett <simon.haggett@gmail.com>
common/compat.h | 13 +++++++++++++
p11-kit/rpc-transport.c | 47 +++++++++++++++++++++++++++++++++++------------
2 files changed, 48 insertions(+), 12 deletions(-)
commit c689917b393379d288b868f70b2f7b7f6aafe430
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-23
tests: Avoid uninitialized value in test-proxy.c
p11-kit/test-proxy.c | 4 ++++
1 file changed, 4 insertions(+)
commit 330148bef17a39075a0af5e446c9502bf3a225ff
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-22
build: Suppress compiler warning
Remove unused "global" variable.
p11-kit/proxy.c | 1 -
1 file changed, 1 deletion(-)
commit 0eb1f6782c5315fc6b46861bc9f92a765e229e14
Author: Raphael Medaer <raphael@medaer.me>
Date: 2019-05-22
doc: Add 'server' command in help
'server' is the last common command which is not in CLI help.
IMHO, adding this small documentation could help to promote usage of
pkcs11 forwarding.
p11-kit/p11-kit.c | 1 +
1 file changed, 1 insertion(+)
commit 9a546b4571f20b271058990e94833f35e4ec39c0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-22
Release 0.23.16
NEWS | 10 ++++++++++
configure.ac | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
commit 381d16e651d5bcace316fbab4095c8dea8c43a92
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-16
proxy: Support C_WaitForSlotEvent() if CKF_DONT_BLOCK is specified
While fully implementing C_WaitForSlotEvent() would require a separate
thread to monitor events, it is straightforward to implement the
function if the CKF_DONT_BLOCK flag is given.
Suggested by David Ward.
p11-kit/Makefile.am | 7 ++++-
p11-kit/mock-module-ep7.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/proxy.c | 64 +++++++++++++++++++++++++++++++++----------
p11-kit/test-proxy.c | 40 +++++++++++++++++++++++++++
4 files changed, 166 insertions(+), 15 deletions(-)
commit 68ce31aae9a22d18b28f4aa44b3e1006b7fe3aa7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-17
conf: Ignore user configuration if the program is running as root
Suggested by Bastien Nocera:
https://bugzilla.redhat.com/show_bug.cgi?id=1688583
p11-kit/conf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 58cede114664e839b53d923863bff604ce58b1a7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-05-15
proxy: Refresh slot list on every C_GetSlotList call
Previously, the proxy module calculated the slot list only once at the
C_Initialize() call. That was causing a usability limitation when the
user attaches HSM after starting an application.
Suggested by David Ward.
p11-kit/Makefile.am | 7 ++-
p11-kit/mock-module-ep6.c | 76 ++++++++++++++++++++++++++++
p11-kit/proxy.c | 123 +++++++++++++++++++++++++++++-----------------
p11-kit/test-proxy.c | 34 ++++++++++++-
4 files changed, 192 insertions(+), 48 deletions(-)
commit 793cc3b78f17bb5a3c151eba1144b73a5d51be3e
Author: Simon Haggett <simon.haggett@gmail.com>
Date: 2019-03-12
modules: Fix index used in call to p11_dict_remove()
This fixes a call to p11_dict_remove() in managed_steal_sessions_inlock() to use
the correct index in the stolen array (i, rather than at). This avoids an
assert, which was encountered on a host serving a PKCS#11 module to a remote
Linux client.
Signed-off-by: Simon Haggett <simon.haggett@gmail.com>
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cbe95e35f8309493094c93d882d0c18e8063f292
Author: Tom Sutcliffe <tomsci@me.com>
Date: 2019-03-09
Fix Win32 p11_dl_error crash
Caused by returning a buffer that wasn't allocated with malloc and
needed to be freed with LocalFree() instead. The fix is to strdup
msg_buf so what's returned can be free()d.
common/compat.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 4a925177a81c2566d2a81a0a450607a5ff4d9048
Author: Stefano Garzarella <sgarzare@redhat.com>
Date: 2019-02-27
modules: check gl.modules before iterates on it when freeing
In some circumstances, as described in the BZ, can happen that
free_modules_when_no_refs_unlocked() is called multiple times
when the module destructor is invoked.
We should check gl.modules before iterates on it in the
free_modules_when_no_refs_unlocked() functions, to avoid
a SIGSEGV.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1680963
p11-kit/modules.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
commit e2170b295992cb7fdf115227a78028ac3780619f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-02-18
trust: Ignore unreadable content in anchors
This amends eb503f3a1467f21a5ecc9ae84ae23b216afc102f. Instead of
failing C_FindObjectsInit, treat any errors internally and accumulates
the successfully loaded certificates.
Reported by Andrej Kvasnica in:
https://bugzilla.redhat.com/show_bug.cgi?id=1675441
trust/module.c | 3 +--
trust/test-module.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 23 +++++++---------
3 files changed, 88 insertions(+), 15 deletions(-)
commit 2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-01-28
extract-jks: Prefer _p11_extract_jks_timestamp to SOURCE_DATE_EPOCH
Give _p11_extract_jks_timestamp precedence over SOURCE_DATE_EPOCH so
that the test results are not affected by the envvar settings.
trust/extract-jks.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 1ba80c67c492f25581ed97c8c31ffb5f20636d06
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-01-14
Release 0.23.15
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit f277a1469aef05d3542e8ae9fd3f5dbadbe12463
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-01-11
pem: Fix assert condition
If the PEM header is "-----BEGIN -----", *type should be an empty
string and the parser shouldn't fail. Reported by Han Han in:
https://bugzilla.redhat.com/show_bug.cgi?id=1665172
trust/pem.c | 2 +-
trust/test-pem.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
commit bebf4f3442ea5cdaa3a9fa2d0fee366e7264a227
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-01-09
test: Add test that exercises duplicated certs in JKS
trust/extract-jks.c | 2 +-
trust/fixtures/duplicated.jks | Bin 0 -> 2122 bytes
trust/fixtures/duplicated1.der | Bin 0 -> 1010 bytes
trust/fixtures/duplicated2.der | Bin 0 -> 1010 bytes
trust/fixtures/multiple.jks | Bin 2556 -> 2567 bytes
trust/test-jks.c | 58 ++++++++++++++++++++++++++++++++++++++---
6 files changed, 55 insertions(+), 5 deletions(-)
commit 7289639cf41df1840002e865bf700f50afec523c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2019-01-09
trust: Fix alias generation in JKS extractor
When there is a duplicate, the JKS extractor previously assigned
somewhat obscure name "-<digit>" (not "<name>-<digit>").
trust/extract-jks.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 5e6a92b67ddade14a54769b05cc717043bc56b78
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-12-25
trust: Continue parsing if the file cannot be read as persist format
A corrupted file that contains "[p11-kit-object-v1]" can be a valid
PEM certs file. Continue with the next format if it cannot be read as
a persistent format.
trust/parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4aa6ef9e82f6bb14746a47a7d56789d5e982a1f5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-12-25
trust: p11_token_load: Treat parse error as failure
Those conditions can happen when the trust file is corrupted, so it
makes more sense to treat them as a failure instead of programmer
error.
trust/token.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
commit eb503f3a1467f21a5ecc9ae84ae23b216afc102f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-12-25
trust: Fail if trust anchors are not loaded from a file
If the trust path is a file, treat parse error as fatal and abort the
C_FindObjectsInit call.
trust/module.c | 11 ++++++++---
trust/token.c | 6 +++---
2 files changed, 11 insertions(+), 6 deletions(-)
commit 0dd62395788ae566d3adef967611bce214a04435
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-12-23
trust: Propagate library verbosity to module through init_args
Previously, even when the -v option is used with the 'trust' command,
the messages from p11-kit-trust.so module were suppressed because the
verbosity setting is not propagated to the module.
common/message.c | 8 ++++----
p11-kit/modules.c | 29 +++++++++++++++++++++++------
p11-kit/p11-kit.h | 3 ++-
trust/enumerate.c | 11 +++++++++--
trust/module.c | 5 +++++
trust/p11-kit-trust.module | 4 ++++
6 files changed, 47 insertions(+), 13 deletions(-)
commit 95faa51a23fc416e718dbd740adfce31f642530b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-12-29
build: Fix typo spotted by codespell
ChangeLog | 2 +-
NEWS | 8 ++++----
common/pkcs11.h | 2 +-
common/test-lexer.c | 2 +-
doc/manual/Makefile.am | 2 +-
p11-kit/iter.c | 2 +-
p11-kit/modules.c | 2 +-
p11-kit/rpc-message.c | 6 +++---
p11-kit/rpc-server.c | 4 ++--
p11-kit/test-pin.c | 2 +-
p11-kit/test-virtual.c | 2 +-
trust/test-enumerate.c | 2 +-
trust/test-parser.c | 2 +-
trust/test-token.c | 4 ++--
trust/trust-extract-compat.in | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
commit 4ee6545d0188e495f195b7fe5abbe9cc382a626d
Author: Jakub Jelen <jjelen@redhat.com>
Date: 2018-12-06
doc: Make log-calls match the rest of the document style
doc/manual/pkcs11.conf.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit b9eceda29965af989ad2150082454ae353266fa5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-11-23
build: Simplify assertions
Let it leak memory when we assert, so not to confuse static analyzers
as if this is the normal case.
common/test.c | 6 ------
1 file changed, 6 deletions(-)
commit b92e8c7f5c082a55073903d53293e6aeecb9d0ed
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-11-22
travis: Add cppcheck profile
.travis.yml | 4 ++++
.travis/cppcheck/after_failure.sh | 3 +++
.travis/cppcheck/before_install.sh | 9 +++++++++
.travis/cppcheck/install.sh | 14 ++++++++++++++
.travis/cppcheck/script.sh | 3 +++
5 files changed, 33 insertions(+)
commit d293fd54c754190da333496df070992e2d803a87
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-11-22
travis: Allow profile override
.travis.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
commit f0c82b07f8b31a4b86de32436cb4f5053de16336
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-11-22
build: Suppress cppcheck errors
common/test-tests.c | 2 ++
common/test.c | 4 ++++
p11-kit/server.c | 8 ++++++--
trust/test-bundle.c | 9 ++++++---
trust/test-openssl.c | 9 ++++++---
trust/test-save.c | 22 +++++++++++++++-------
trust/test-trust.c | 4 +++-
7 files changed, 42 insertions(+), 16 deletions(-)
commit 8287689158403090b5828a568b122b5b3a3ce987
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-22
tests: Ensure p11_proxy_module_cleanup is called
Reported and suggested in #197.
p11-kit/test-proxy.c | 2 ++
1 file changed, 2 insertions(+)
commit f758142178b4cc5c650dde75152bfb85ac992178
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-15
url: Prefer upper-case letters in hex characters when encoding
This makes it more compliant with RFC 3986, where the use of
upper-case letters is recommended (as "SHOULD").
Suggested by Sumit Bose.
common/test-path.c | 2 +-
common/test-url.c | 28 ++++++++++++++++++++++++++++
common/url.c | 24 +++++++++++++++++-------
p11-kit/test-uri.c | 14 +++++++-------
4 files changed, 53 insertions(+), 15 deletions(-)
commit e81f6af7ed3b39b8df0bb7ce150619ea8178d47c
Author: Harald Hoyer <harald@redhat.com>
Date: 2018-11-02
trust/extract-jks.c: also honor SOURCE_DATE_EPOCH time
For reproducible builds, accept a define timestamp for the java
keystore.
See https://reproducible-builds.org/docs/source-date-epoch/
trust/extract-jks.c | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
commit 1d6913d5a551b6bd8efaa1705178e49f1527aa7e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-30
build: Require pkg.m4 >= 0.29 at bootstrap
configure.ac | 2 ++
1 file changed, 2 insertions(+)
commit 6e1046de2233fba7875d3d6a1b260192678dd0ad
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-19
virtual: Prefer fixed closures to libffi closures
On some circumstances (such as when loading p11-kit-proxy from httpd),
it is known that creation of libffi closure always fails, due to
SELinux policy. Although this is harmless, it pollutes the journal
and gives wrong hints when troubleshooting. This patch changes the
order of preference of libffi vs pre-compiled closures to avoid that.
p11-kit/virtual.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
commit 83e92c2f9575707083d8b0c70ef330e285d70836
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-17
trust: Check index->buckets is allocated on cleanup
trust/index.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit 6417780ebbbbb0f01ddb001b239347655fb98578
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-17
rpc-server: Check calloc failure
p11-kit/rpc-server.c | 4 ++++
1 file changed, 4 insertions(+)
commit da73c2804b3ca962fa51473bb4c303a5ed32d4a1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
trust: Set umask before calling mkstemp
trust/save.c | 3 +++
1 file changed, 3 insertions(+)
commit 033cd90806cb1e2eab7e799703757abc2f07052e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
proxy: Fix null dereference when reusing slots
p11-kit/proxy.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 1f78cb0b4dd193ec1f1b2b424a497a6c2edec043
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
rpc-server: p11_kit_remote_serve_tokens: Fix memleak
p11-kit/rpc-server.c | 5 +++++
1 file changed, 5 insertions(+)
commit 213ea0815ef45411bf6c134918b79d2aad69c1dc
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
build: Check return value of p11_rpc_buffer_get_uint64
p11-kit/rpc-client.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 06323aed926ddc67bd18ed98e5af92035a8e3d39
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
build: Check return value of p11_dict_set
p11-kit/proxy.c | 3 ++-
p11-kit/rpc-server.c | 6 +++++-
trust/module.c | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
commit b10dadce5a3c921149b2c9fe0dec614f8076ebda
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
build: Free memory before return{,_val}_if_* macros
p11-kit/iter.c | 5 ++++-
p11-kit/proxy.c | 10 ++++++++--
trust/asn1.c | 15 ++++++++++++---
trust/builder.c | 5 ++++-
trust/index.c | 10 ++++++++--
trust/persist.c | 5 ++++-
trust/save.c | 29 +++++++++++++++++++++++++----
trust/session.c | 10 ++++++++--
trust/token.c | 5 ++++-
9 files changed, 77 insertions(+), 17 deletions(-)
commit c76197ddbbd0c29adc2bceff2ee9f740f71d134d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
build: Call va_end() always when leaving the function
common/attrs.c | 4 +++-
common/compat.c | 5 ++++-
common/path.c | 5 ++++-
trust/parser.c | 4 +++-
4 files changed, 14 insertions(+), 4 deletions(-)
commit 8a8db182af533a43b4d478d28af8623035475d68
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-10-16
debug: Work around cppcheck false-positives
https://trac.cppcheck.net/ticket/8794
common/debug.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit f4a9fa674e17cc470d9280237032f18a70313d8e
Author: Leonardo Brondani Schenkel <leo@tradeshift.com>
Date: 2018-05-28
common: use /proc only on Linux
Non-Linux systems do not have /proc, so do not attempt to open it and
eliminate an unnecessary access() syscall on those systems.
common/compat.c | 2 ++
1 file changed, 2 insertions(+)
commit 7f1df14e041c6de9603a4720753ca8f31e32b4ff
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-31
pkcs11: Don't redefine CKM_CAMELLIA_KEY_GEN
Also reorder the CKM_CAMELLIA_* definitions.
common/pkcs11.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 3770793f026e46a000d2d8816d56122598289d5c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-28
Release 0.23.14
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit c1b565413dae632a4ab78cea08ed103d9418921b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-22
virtual: Tighten error handling when fixed closures are exhausted
p11-kit/virtual.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
commit 347a8793d23036433ab0ba39049f0e832bb05b3d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-22
virtual: Don't be too loud about recoverable failure
p11-kit/virtual.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9a7892ef3fd9d4bd70df41fb0200782dc6134c70
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-24
trust: Factor out module initialization into separate file
This prevents double call to p11_library_init() in test-module.c, once
from the ELF constructor, and secondly from the test itself.
trust/Makefile.am | 2 +-
trust/module-init.c | 43 ++++++++++++++++++++++++++++++++++++++++++
trust/module.c | 54 -----------------------------------------------------
3 files changed, 44 insertions(+), 55 deletions(-)
commit 0d7fbd5189ba1414d84326ddc8e4cff98f66a44b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-27
common: Factor out common initializer code into a header
common/Makefile.am | 1 +
common/init.h | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/client-init.c | 60 +++-----------------------------
p11-kit/proxy-init.c | 59 +++-----------------------------
4 files changed, 103 insertions(+), 111 deletions(-)
commit 0961cf527f1414bf5a900d958ee776cdd28f3525
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-24
travis: Manually install cpp-coveralls
To accommodate the gcov format change in gcc 8.1:
https://github.com/eddyxu/cpp-coveralls/pull/127
which is not yet available in the pip version.
.travis/linux/after_success.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 2066e7c57a7ae82e35fee3deaa06d89498d749a3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-23
travis: Check valgrind exit code more strictly
.travis/linux/script.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7a844d8e8c1c87401b161094023cf309ca111095
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-21
README.md: Add CII Best Practices badge
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f2a17c5e1dbc75a0142c6330bab588deb0060151
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-21
README.md: Mention contact method for security issues
README.md | 5 +++++
1 file changed, 5 insertions(+)
commit b9ef1c5f4dbdfbab504479fdc899e344ff7bb44a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-17
Revert "build: Explicitly link threaded test programs to libpthread"
This reverts commit dc4a6eaddbb36a344cc6a9c7eb12cab9df4899b0.
configure.ac | 10 ----------
p11-kit/Makefile.am | 8 ++++----
2 files changed, 4 insertions(+), 14 deletions(-)
commit 35b39cb2bf6d50a117a9e4c8e18100d19716ea71
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-17
Revert "build: Stop linking the library with libpthread when possible"
This reverts commit 50f8906e63c9413a7687bab6608496d83c29a222.
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 56f3b9370747a7a33a9d56ff9365c89700dd0e67
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-17
Revert "common: Prefer __register_atfork() to pthread_atfork() if possible"
This reverts commit ce3cec7f8742254b8627b9db48973b81e91cbfc8.
common/library.c | 19 +------------------
configure.ac | 2 --
2 files changed, 1 insertion(+), 20 deletions(-)
commit a877b0eca3d59f7f8cd126047c0e899df6018858
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-17
Revert "build: Link to libpthread, if pthread_atfork() needs to be used"
This reverts commit 541d79cb651cfd3238b9aa41fce70208df8e9496.
NEWS | 2 +-
common/library.c | 10 ++++------
configure.ac | 7 +------
3 files changed, 6 insertions(+), 13 deletions(-)
commit f69746d140cec20516c223825523fb0ade53384a
Author: Alexander Bokovoy <abokovoy@redhat.com>
Date: 2018-08-14
Update pkcs11 header to allow SoftHSMv2 to compile
Replace vendor-specific values with the IDs from PKCS11 v3.0 for those
constants that were already standardized.
common/pkcs11.h | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 220 insertions(+), 18 deletions(-)
commit abc542bd5abf46c5170f8a0c3dcc62eff0c9cfde
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-13
travis: Check that proxy module can be loaded and unloaded
.travis/linux/before_install.sh | 2 +-
.travis/linux/script.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit 34416ed787d804e0d293e47f2d10dc62ddea407c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-13
proxy: Avoid invalid memory access when unloading proxy module
When loading and unloading p11-kit-proxy.so with pkcs11-tool, it
accesses already free'd memory area:
$ valgrind pkcs11-tool --module p11-kit-proxy.so -L
==25173== Invalid read of size 8
==25173== at 0x64BF493: p11_proxy_module_cleanup (proxy.c:1724)
==25173== by 0x64BD028: _p11_kit_fini (proxy-init.c:65)
==25173== by 0x401477C: _dl_close_worker (in /usr/lib64/ld-2.27.so)
==25173== by 0x4014E1D: _dl_close (in /usr/lib64/ld-2.27.so)
==25173== by 0x5E08C4E: _dl_catch_exception (in /usr/lib64/libc-2.27.so)
==25173== by 0x5E08CDE: _dl_catch_error (in /usr/lib64/libc-2.27.so)
==25173== by 0x58B1724: _dlerror_run (in /usr/lib64/libdl-2.27.so)
==25173== by 0x58B1113: dlclose (in /usr/lib64/libdl-2.27.so)
==25173== by 0x11E5A7: ??? (in /usr/bin/pkcs11-tool)
==25173== by 0x110023: ??? (in /usr/bin/pkcs11-tool)
==25173== by 0x5CF624A: (below main) (in /usr/lib64/libc-2.27.so)
==25173== Address 0x61231c8 is 552 bytes inside a block of size 584 free'd
==25173== at 0x4C2FDAC: free (vg_replace_malloc.c:530)
==25173== by 0x6548492: p11_virtual_unwrap (virtual.c:2902)
==25173== by 0x64BF492: p11_proxy_module_cleanup (proxy.c:1723)
p11-kit/proxy.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
commit 541d79cb651cfd3238b9aa41fce70208df8e9496
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-10
build: Link to libpthread, if pthread_atfork() needs to be used
On non-glibc systems (e.g., FreeBSD), pthread_atfork() stub is
provided as a nop and our fork detection mechanism doesn't work. Pull
in the actual implementation from libpthread in that case.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
NEWS | 2 +-
common/library.c | 10 ++++++----
configure.ac | 7 ++++++-
3 files changed, 13 insertions(+), 6 deletions(-)
commit 6a8da20c0432499480731548256294844cade631
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-10
build: Don't install systemd unit files when "make distcheck"
Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit ef001069d069df43de029f3b84206676badd8a4e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-10
Release 0.23.13
NEWS | 7 +++++++
configure.ac | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit ce3cec7f8742254b8627b9db48973b81e91cbfc8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-09
common: Prefer __register_atfork() to pthread_atfork() if possible
common/library.c | 19 ++++++++++++++++++-
configure.ac | 2 ++
2 files changed, 20 insertions(+), 1 deletion(-)
commit 50f8906e63c9413a7687bab6608496d83c29a222
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-13
build: Stop linking the library with libpthread when possible
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit ebfd7da82d7b9eea81067479861aac2d2c07cc29
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-20
common: Use thread-local storage class when possible
This eliminates the unconditional use of pthread_{get,set}specific()
and pthread_key_{create,delete}(), which glibc doesn't provide the stubs.
common/library.c | 22 ++++++++++++++++++++++
configure.ac | 12 ++++++++++++
2 files changed, 34 insertions(+)
commit dc4a6eaddbb36a344cc6a9c7eb12cab9df4899b0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-20
build: Explicitly link threaded test programs to libpthread
Some test programs use pthread_create(), which glibc doesn't provide
the stub. Link those programs with -lpthread.
configure.ac | 10 ++++++++++
p11-kit/Makefile.am | 8 ++++----
2 files changed, 14 insertions(+), 4 deletions(-)
commit f04c2a84ad2a017a778fa2f23719318acb9ca89f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-20
common, p11-kit, trust: Use pthread_once only when necessary
If the ELF constructor is usable, we don't really need the once-init
function because it is guaranteed that the code runs only once in the
constructor.
common/library.c | 4 +++-
common/library.h | 10 ++++++++++
p11-kit/client-init.c | 2 +-
p11-kit/proxy-init.c | 2 +-
trust/module.c | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
commit 5b18e77e9dbb6a598812427ba07ad6df63eb7a67
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-20
common: Use static mutex initializer when possible
This eliminates the use of pthread_mutexattr_* functions, which glibc
doesn't provide the stubs.
common/compat.c | 4 +++-
common/compat.h | 18 +++++++++++++++++-
common/library.c | 14 ++++++++++----
3 files changed, 30 insertions(+), 6 deletions(-)
commit 22cb49b9105657cafb98624be37f05b169f73dd6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-08-01
server: Avoid FD leak in error cases
Spotted by coverity.
p11-kit/server.c | 3 +++
1 file changed, 3 insertions(+)
commit 19aaf573580e52265f57f9b7af7a03bfdfaf71e0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-19
trust: Clarify C_Login behavior that returns an error
trust/module.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit ab27346ceb5d4e856671a033ac1f6521c86514a1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-10
proxy: Fail early if there is no slot mappings
p11-kit/proxy.c | 2 ++
p11-kit/test-proxy.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
commit fb5742cdecfde1c13d9ce610cdec050792cc57ca
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-09
travis: Install pip for coveralls
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b6d20ac16da7128089031248eed4afe08f6934d3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-06-27
rpc-server: p11_kit_remote_serve_tokens: Allow exporting all modules
This patch removes the restriction of p11_kit_remote_serve_tokens()
that were not capable of serving tokens across multiple modules.
p11-kit/Makefile.am | 5 +-
p11-kit/remote.h | 2 +-
p11-kit/rpc-server.c | 209 ++++++++++++++++++++++++++++++++++----------------
p11-kit/test-server.c | 83 +++++++++++++++-----
4 files changed, 210 insertions(+), 89 deletions(-)
commit 9d2ce267e6714c6a565a9ded3aa0001918d1ae1d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-06-27
build: Use separate p11-kit-{remote,server} executable for testing
Otherwise, the p11-kit-remote program called from p11-kit-server would
load the system modules instead of the local fixtures.
.gitignore | 2 ++
p11-kit/Makefile.am | 26 ++++++++++++++++++++++++++
p11-kit/server.c | 2 +-
p11-kit/test-server.c | 4 ++--
4 files changed, 31 insertions(+), 3 deletions(-)
commit 8d8bff0a2edf4659b641dde1333eb6a7c695671c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-06-25
proxy: Allow proxy to be created from the library
Previously, to aggregate multiple modules into one, there was no other
way than loading the proxy module. From the p11-kit applications,
however, it is not possible to load that module because of the
recursive loading check (p11_proxy_module_check).
This patch adds another means to aggregate modules, through a library
function p11_proxy_module_create.
p11-kit/proxy.c | 40 +++++++++++++++++++++++++++++++++++++++-
p11-kit/proxy.h | 3 +++
2 files changed, 42 insertions(+), 1 deletion(-)
commit a65696b3e79acb602bd0c000f8524d3cc8998187
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-06-25
proxy: Turn global variables module local
p11-kit/proxy.c | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
commit c53888a802eed4baa4aff54060334d2fdbfc7648
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-07-13
build: Make reallocarray detection robuster
On NetBSD, reallocarray is not declared until _OPENBSD_SOURCE is
defined. Reported by Patrick Welche in:
https://lists.freedesktop.org/archives/p11-glue/2018-July/000691.html
common/compat.h | 2 +-
configure.ac | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit 53a7e915b2694bc1957d98493a7aee9abfa3c6c5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-06-20
server: Enable socket activation through systemd
This enables socket activation of "p11-kit server" through systemd.
The feature provided is essentially the same as commit
a4fb2bb5 (reverted), but implemented with "p11-kit server" and
libsystemd API instead of wrapping "p11-kit remote" in the unit file.
Note that, while it exposes all tokens through the socket, it doesn't
increase attack surface beyond the PKCS#11 binary interface provided
by p11-kit-proxy.so, because the service is per-user.
.gitignore | 2 +-
configure.ac | 23 +++++++++++++++++++++++
p11-kit/Makefile.am | 22 ++++++++++++++++++++++
p11-kit/p11-kit-server.service.in | 15 +++++++++++++++
p11-kit/p11-kit-server.socket | 11 +++++++++++
p11-kit/server.c | 33 ++++++++++++++++++++++++---------
6 files changed, 96 insertions(+), 10 deletions(-)
commit d4a4039f97b2e1f67d09d7cd8c05fb2dd129b23c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-31
build: Ease issetugid() check when cross-compiling
When cross-compiling, the configure check for issetugid() aborts,
because of the pessimistic default of AC_RUN_IFELSE. This patch
provides the non-pessimistic default to AC_RUN_IFELSE and wrap the
macro invocation with AC_CACHE_CHECK so that the user can override the
check by setting ac_cv_issetugid_openbsd=yes, as suggested in:
https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Runtime.html#Runtime
configure.ac | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
commit 3dd5810143e51dabdc58069e55b09a950349fa08
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-28
Release 0.23.12
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit f696eddecaa1f1cd1687ab5dbb942128aaca1903
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-29
travis: Add build scripts for macOS
.travis.yml | 1 +
.travis/osx/after_failure.sh | 3 +++
.travis/osx/before_install.sh | 5 +++++
.travis/osx/script.sh | 6 ++++++
4 files changed, 15 insertions(+)
commit a21898570d3e713155f0d8048bc6350f069f58ff
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-29
travis: Use matrix
.travis.yml | 84 +++++++++++++++++++++--------------------
.travis/linux/after_failure.sh | 3 ++
.travis/linux/after_success.sh | 9 +++++
.travis/linux/before_install.sh | 9 +++++
.travis/linux/install.sh | 14 +++++++
.travis/linux/script.sh | 11 ++++++
6 files changed, 90 insertions(+), 40 deletions(-)
commit 35637892e517d0e8e08dbe214f638317499ea0f5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-29
test: Avoid unnecessary memory allocation
common/test-runtime.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit ccb0c207964189742e97acfd817fb3c6b99e5865
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-29
common: Fix runtime directory detection when given prefix is long
common/runtime.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 71b62aa1cdbdec3724c8e451f621309994dc59a0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-29
common: Don't rely on issetugid() when it is broken
On macOS and FreeBSD, issetugid() has different semantics from the
original OpenBSD implementation and cannot reliably detect if the
process made setuid/setgid:
https://gist.github.com/nicowilliams/4daf74a3a0c86848d3cbd9d0cdb5e26e
This should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=67451
https://bugs.freedesktop.org/show_bug.cgi?id=100287
common/compat.c | 2 +-
configure.ac | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
commit 79f928492dba6a46c63e77d6b22c17c23e66403b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-28
build: Don't use locale funcs if locale_t is not defined in locale.h
On macOS, locale_t is not defined in <locale.h>. Although it is
defined in <xlocale.h>, we rather not use locales at all for POSIX
compliance.
common/compat.h | 6 ++++++
common/debug.c | 4 ++--
common/library.c | 6 +++---
common/message.c | 4 ++--
common/test-message.c | 6 +++---
configure.ac | 11 ++++++++---
6 files changed, 24 insertions(+), 13 deletions(-)
commit cd0a2de679a81829b7323bc5db46222b9eaab1d9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-28
pkcs11: Exercise GNU calling convention at compile time
.gitignore | 1 +
p11-kit/Makefile.am | 32 ++++++++++++++++++++++++++++++++
p11-kit/iter.h | 10 ++++++++++
p11-kit/uri.h | 4 ++++
4 files changed, 47 insertions(+)
commit e4c5d3b34941bdc433072a492a0a7fdbddba0cc2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-25
build: Simplify README inclusion
Use symlink in the repository, instead of copying.
.gitignore | 1 -
Makefile.am | 7 +------
README | 1 +
3 files changed, 2 insertions(+), 7 deletions(-)
commit 65dd5469ad164465583167c63114478587db59fd
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
NEWS: Mention latest changes
NEWS | 2 ++
1 file changed, 2 insertions(+)
commit 8b90031aeb495116a87851dca50845b8df0d1e90
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-25
build: Delay building mock-six.la until "make check"
p11-kit/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 8df105871eb5f6bca3e5f4dcf165f2bbf920f106
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
build: Include README in the distribution
As we removed README from the repository, it is no longer
automatically picked up for the distribution by Automake.
Makefile.am | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 275eed62b5d0e17c092b66af233ffc5b2f45245b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
build: Fix ChangeLog generation
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bf204ada4685415287b3d03b3d79634c86739b83
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
build: Remove obsolete upload rules
Makefile.am | 15 ---------------
1 file changed, 15 deletions(-)
commit e2002df5707dd306cea0684706361be72891231b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
build: Include p11-kit/test-messages.sh in distribution
p11-kit/Makefile.am | 1 +
1 file changed, 1 insertion(+)
commit 258da75cd606a3653bc414a6ace01c8bfdfabca6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
uri: Make scheme comparison case-insensitive
RFC 3986 suggests that implementations should accept uppercase letters
as equivalent to lowercase in scheme names.
p11-kit/test-uri.c | 21 +++++++++++++++++++++
p11-kit/uri.c | 12 +++++++++---
2 files changed, 30 insertions(+), 3 deletions(-)
commit 117b35db99af4331daad4279eadfb9280e0c1325
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-24
common: Make case conversion locale independent
The tolower()/toupper() functions take into account of the current
locale settings, which p11-kit doesn't want. Add replacement
functions that work as if they are called under the C locale.
common/compat.c | 16 ++++++++++++++++
common/compat.h | 3 +++
common/mock.c | 4 ++--
common/url.c | 4 ++--
trust/extract-jks.c | 2 +-
trust/extract-openssl.c | 2 +-
6 files changed, 25 insertions(+), 6 deletions(-)
commit e42dcf5283a5537c196147c9a2468ee537b9da7b
Author: Nathaniel McCallum <npmccallum@redhat.com>
Date: 2018-05-14
Improve const correctness for P11KitUri
This does not improve const for the getters. The reason for this is that
they are usually passed into the PKCS#11 APIs directly and these APIs
are not const correct. Trying to force const correctnesss here would
result in pain for library consumers.
This is an API and ABI compatible change.
p11-kit/private.h | 12 ++++++------
p11-kit/uri.c | 34 +++++++++++++++++-----------------
p11-kit/uri.h | 36 ++++++++++++++++++------------------
3 files changed, 41 insertions(+), 41 deletions(-)
commit 6af8234936f805a9c6dceb29a84e73d40ed4b257
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2018-05-18
README: replace by README.md
That is, use README.md as primary source to generate README as
README is required by the GNU guidelines. We don't try to convert
to "real" plain text as markdown is readable, and to avoid introducing
another dependency (e.g., pandoc).
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
.gitignore | 1 +
Makefile.am | 1 +
README | 8 --------
3 files changed, 2 insertions(+), 8 deletions(-)
commit 58c3eb9acf5885069652f1b02edb7aca01580b96
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2018-05-18
NEWS: mark the 0.23 series as stable
Resolves #80
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
NEWS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 14610d49c4e6c68022be63df1481f74ccb0aa75a
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2018-05-18
README.md: added reference to Daiki's key
Resolves #153
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
README.md | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
commit f272dd4a1c68125c8f696b1e0eebb15c45c6923a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-07
Release 0.23.11
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 5f68c96da949b08e2afd109d276d80e42cab68b7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-07
common: Pacify clang-analyzer
common/buffer.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 98fbfc3b6126c809eb44c700871facca6ac7727d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-07
trust: Avoid array overflow
trust/builder.c | 4 ++--
trust/extract-openssl.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
commit 34ab20cbf79ca50972bf3088c8b6e9978ff0dc2b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-07
trust: Don't null terminate PKCS #11 string fields
trust/module.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit ba006ed40cad2e0d1fe3c3355c18bdfb612c2cd6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-07
proxy: Don't null terminate PKCS #11 string fields
p11-kit/proxy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 1b85c62af8146efa0e648a297179db2bbfe59b43
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-05-03
test: Avoid exceeding maximum pathname length of Unix socket
p11-kit/test-server.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit a625dfa4f2456b1a866489e5be15fb46578237a5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-27
library: Use dedicated locale object for printing error
common/debug.c | 14 +++++++-------
common/library.c | 13 +++++++++++++
common/message.c | 14 +++++++-------
common/test-message.c | 15 +++++++++++++++
configure.ac | 2 +-
5 files changed, 43 insertions(+), 15 deletions(-)
commit 6202903b261dfae740af3f8e985244bab48470ba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-27
Revert "build: Check strerror_l() and uselocale() seperately"
This reverts commit 173ad93cc54057886b2055f3d73ea64a047127d1.
We should rather use newlocale() when per-thread locale is not set.
Otherwise uselocale() could return LC_GLOBAL_LOCALE on some
platforms (e.g. musl-libc) and calling strerror_l() with it leads to
an undefined behavior.
common/debug.c | 9 ++-------
common/message.c | 9 ++-------
configure.ac | 2 +-
3 files changed, 5 insertions(+), 15 deletions(-)
commit 173ad93cc54057886b2055f3d73ea64a047127d1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-19
build: Check strerror_l() and uselocale() seperately
NetBSD deliberately doesn't support per-thread locale and our
thread-safe replacement of strerror() using strerror_l() cannot be
used. Fallback to strerror_r() in that case.
common/debug.c | 9 +++++++--
common/message.c | 9 +++++++--
configure.ac | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
commit a95c7a3e936896349bf925ca7cd47f0a03166249
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
travis: Optimize dnf install invocation
.travis.yml | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
commit e4b86e449a83428592e45db28834be950e837d74
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
test: Add installcheck script to test trust module
Currently it only checks that "disable-in: p11-kit-proxy" properly
prevents the trust module being loaded by the proxy module.
trust/Makefile.am | 4 +++-
trust/test-trust.sh | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
commit 5d97643884879d4967d21cb29c9917271a4b65db
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
trust: Prevent trust module being loaded by proxy module
Otherwise, when the proxy module were registerd in NSS database, the
trust module would be loaded twice and degrade search performance.
trust/p11-kit-trust.module | 3 +++
1 file changed, 3 insertions(+)
commit af71f7961370714112f258c0e404d96bdef9cee9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
travis: Run "make installcheck"
.travis.yml | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
commit cbef7f5d8a14d46ecdf0c25c3d38d26598a66f8c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
trust: Fix memleak in p11_enumerate_opt_filter
p11_kit_iter_add_filter() takes the ownership of given attributes.
Spotted by address sanitizer.
trust/enumerate.c | 1 +
1 file changed, 1 insertion(+)
commit e4a5466e5e3cfe22344e79c6e1a0ad9a7945a602
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-10
test: Factor out common harness from test-extract.in
.gitignore | 2 +-
configure.ac | 2 +-
trust/Makefile.am | 7 +-
trust/{test-extract.in => test-extract.sh} | 92 +------------------------
trust/test-init.sh.in | 106 +++++++++++++++++++++++++++++
5 files changed, 114 insertions(+), 95 deletions(-)
commit dcb6ee3fa89e0c9586e2b09e1f60aa076f263123
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-31
test: Add test for JKS extractor
Piggybacking commit de963b96, this adds a multi-cert test case for the
Java keystore extractor.
trust/Makefile.am | 5 ++
trust/extract-jks.c | 7 +-
trust/fixtures/multiple.jks | Bin 0 -> 2556 bytes
trust/test-jks.c | 213 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 224 insertions(+), 1 deletion(-)
commit af6ab322b1ad9a4f4a0117a79bd566550ec0a0a8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-05
test: Add test for p11_attrs_purge()
common/test-attrs.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
commit 843fca9b67b7407a47bcae698f434c975a4a4e91
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-05
mock-module-ep: Properly override C_GetFunctionList
p11-kit/mock-module-ep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a6d0e490209638605b17b0bdc66ad03d36909dae
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-04-05
modules: Add option to control module visibility from proxy
This enables to control whether a module will be loaded from the proxy
module. The configuration reuses the "enable-in" and "disable-in"
options, with a special literal "p11-kit-proxy" as the value.
doc/manual/pkcs11.conf.xml | 2 ++
p11-kit/modules.c | 35 ++++++++++++++-----
p11-kit/p11-kit.h | 1 +
p11-kit/private.h | 5 +++
p11-kit/proxy.c | 2 +-
p11-kit/test-proxy.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 118 insertions(+), 10 deletions(-)
commit de963b96929b9da61916a0c43b4ac4c34a39e238
Author: Laszlo Ersek <lersek@redhat.com>
Date: 2018-03-29
trust: add unit test for the "edk2-cacerts" extractor
Add a multi-cert test case for the edk2 extractor, heavily based on the
"/openssl/test_file_multiple" test case.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559580
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
trust/Makefile.am | 5 ++
trust/fixtures/multiple.edk2 | Bin 0 -> 2549 bytes
trust/test-edk2.c | 209 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 214 insertions(+)
commit ee27f9153a14d0c6d75f8745a8c1879a6e4bb2e8
Author: Laszlo Ersek <lersek@redhat.com>
Date: 2018-03-27
trust: implement the "edk2-cacerts" extractor
Extract the DER-encoded X.509 certificates in the EFI_SIGNATURE_LIST
format that is
- defined by the UEFI 2.7 spec (using one inner EFI_SIGNATURE_DATA object
per EFI_SIGNATURE_LIST, as specified for EFI_CERT_X509_GUID),
- and expected by edk2's HttpDxe when it configures the certificate list
for HTTPS boot from EFI_TLS_CA_CERTIFICATE_VARIABLE (see the
TlsConfigCertificate() function in "NetworkPkg/HttpDxe/HttpsSupport.c").
The intended command line is
p11-kit extract \
--format=edk2-cacerts \
--filter=ca-anchors \
--overwrite \
--purpose=server-auth \
$DEST/edk2/cacerts.bin
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559580
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
trust/extract-edk2.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 168 insertions(+), 1 deletion(-)
commit 59054e4f9fe3e95f8db881973901ab59a0b1ef8a
Author: Laszlo Ersek <lersek@redhat.com>
Date: 2018-03-27
trust: introduce the "edk2-cacerts" extractor skeleton
Introduce the p11_extract_edk2_cacerts() skeleton. At the moment it always
fails, silently.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559580
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
trust/Makefile.am | 1 +
trust/extract-edk2.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
trust/extract.c | 4 +++-
trust/extract.h | 3 +++
4 files changed, 51 insertions(+), 1 deletion(-)
commit ba6ebb05fc0c8010d8510984ce3c5f908edf13b6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
modules: Fix memleak in re-initialization case
p11-kit/modules.c | 1 +
1 file changed, 1 insertion(+)
commit 1ca877e3d3b1315ee9358f7e3c9096e10e14486e
Author: Justin King-Lacroix <justinkl@google.com>
Date: 2018-03-16
Treat CKR_CRYPTOKI_ALREADY_INITIALIZED correctly
In p11_kit_modules_initialize(), treat a return code
of CKR_CRYPTOKI_ALREADY_INITIALIZED as identical to
CKR_OK.
p11-kit/modules.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 46901ab914e3f37e6e7287d47d9ab1281e3d64dc
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
travis: Disallow failure on mingw
.travis.yml | 4 ----
1 file changed, 4 deletions(-)
commit 41301742772b411eb8b3e819c54b1eb5b9ca82dd
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
test: Add missing seven.module in Windows fixtures
p11-kit/fixtures/system-modules/win32/seven.module | 4 ++++
1 file changed, 4 insertions(+)
commit a3478f097bff647892c18cbab1e6f5b8bd5a6614
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
travis: Use LOG_COMPILER to run tests under wine
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit a711a578ba7a1775bdc20ea00fbbdb4f10f91d58
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
build: Enable make check with wine
build/wine-wrapper.sh | 13 +++++++++++++
p11-kit/test-messages.sh | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
commit bfdd4372ff381ce234d357bb43636b86e6cc1e8f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-29
common: Fix compilation of runtime.c under mingw
common/runtime.c | 29 ++++++++++++++++++++---------
common/test-runtime.c | 14 +++++++++++++-
2 files changed, 33 insertions(+), 10 deletions(-)
commit 7827e65abacc87018be035a3008a4bb89280a85a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-27
test: Add failing test for CKR_CRYPTOKI_ALREADY_INITIALIZED
p11-kit/Makefile.am | 7 ++-
p11-kit/fixtures/system-modules/seven.module | 4 ++
p11-kit/mock-module-ep5.c | 80 ++++++++++++++++++++++++++++
p11-kit/test-modules.c | 25 +++++++++
4 files changed, 115 insertions(+), 1 deletion(-)
commit e454338dddef9089a3b9998cc8ba33e247ee9f26
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-07
test: Add test for error messages
.travis.yml | 2 +-
p11-kit/Makefile.am | 2 +
p11-kit/test-messages.sh | 110 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 1 deletion(-)
commit 007023002811469ae3982a0cfcd9a73aed762ad1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-28
test: Use _exit() in child process to immediately close open FDs
p11-kit/test-proxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 294c0efda49a623f47eb3c459bb5ed812ebc757c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-28
test: Rewrite test-server.sh in TAP style
p11-kit/test-server.sh | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
commit 1eb22867b1123601387b1fa06643077225bd7590
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-27
test: Take advantage of TAP test driver
.gitignore | 1 +
Makefile.am | 4 ++++
configure.ac | 1 +
3 files changed, 6 insertions(+)
commit 9abfcd53e922f5c3841061e363e5ac88d92c2433
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-03-27
common: Add assert_skip() and assert_todo()
common/test.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
common/test.h | 20 ++++++++++
2 files changed, 126 insertions(+), 15 deletions(-)
commit e8d569045c7d224e94836edd77856823aadf8267
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2018-02-27
test-server.sh: Fix bashism
p11-kit/test-server.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit f6b7a992e442218a5afdbf8ae1697c53f3f03991
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
Release 0.23.10
NEWS | 12 ++++++++++++
configure.ac | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
commit 39eb7a3dd16233b16fb1e50fe30d55f5f86fbaa5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
maint: Point to the new URLs
HACKING | 6 +++---
configure.ac | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
commit d2318ca31774d6a02eff5d0b3af2f3c89cb58c9d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
test-server: Add test for detecting address
p11-kit/test-server.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
commit 264ecf416d6d07c558d80031c077a46a909a6f90
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
test-server: Fix compilation error on FreeBSD
p11-kit/test-server.c | 1 +
1 file changed, 1 insertion(+)
commit 44c67d90b0448888c784e661b5967204f5b0d47d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
common, client: Move runtime directory detection to libp11-common
common/Makefile.am | 5 ++
common/runtime.c | 111 ++++++++++++++++++++++++++++++++++++++++++
common/runtime.h | 42 ++++++++++++++++
common/test-runtime.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/client.c | 67 +------------------------
5 files changed, 292 insertions(+), 65 deletions(-)
commit d8acebf175d727a3e146956fb362c30e7fdec9df
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
common: Make p11_test_directory_delete() work recursively
common/test.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit bcf2c4e0a24303f976dbedc0ef0a564b9808a989
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-27
test: Improve temporary directory handling
p11-kit/test-transport.c | 6 ++++--
trust/test-module.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
commit fb8bf5a5f82e5b4f0afe72e247255f37fc0dedc8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-05
p11_kit_remote_serve_tokens: Read "write-protected" setting from URI
p11-kit/rpc-server.c | 12 ++++++++++++
p11-kit/test-server.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
commit a0984024470218295d74bed364c37862d4c61d60
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-05
filter: Respect CKF_WRITE_PROTECTED setting when allowing a token
p11-kit/filter.c | 48 ++++++++++++++++--------
p11-kit/test-filter.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+), 16 deletions(-)
commit d3a1498ef9b8a626bbd864a6c90e45a6278a0e75
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-26
test: Add test for client-server interaction
The test spawns a process running the server command and connects to
it through p11-kit-client.so. It's is a bit tricky that the child
process requires to preload libasan.so when ASan is in in effect, to
properly load a mock module.
.travis.yml | 10 ++-
build/lsan.supp | 3 +
p11-kit/Makefile.am | 4 +
p11-kit/test-server.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 213 insertions(+), 3 deletions(-)
commit f73868b710d4463cc0cff6f8ea2f3a171f86c8e2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-26
server: Print envvars even when running in foreground
p11-kit/server.c | 61 ++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 22 deletions(-)
commit adc760e5ce90d49f7c6183c689f95868341f6fb7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-26
test-transport: Make sure to initialize addrlen given to accept
p11-kit/test-transport.c | 1 +
1 file changed, 1 insertion(+)
commit 47297f9785a21af1bb79450bad549aa8bd33a24c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-26
client: Fix memleaks in the module
p11-kit/client.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
commit 7a018706b54e09f1cc7ce8c6d1ceaecf28b7308b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-26
test: Fix unconditional jump in test-proxy.c
p11-kit/test-proxy.c | 1 +
1 file changed, 1 insertion(+)
commit 975f2ccf5dcde210e1da5557eda627c42763e322
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-02-16
doc: Replace links to freedesktop.org to github pages
doc/manual/p11-kit-devel.xml | 8 ++++----
doc/manual/p11-kit.xml | 4 ++--
doc/manual/pkcs11.conf.xml | 2 +-
doc/manual/trust.xml | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
commit 9616790b9ad4147acd5b11de11d6d79bc9ad807f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-19
trust: Forcibly mark "Default Trust" read-only
The "Default Trust" token is typically mounted as $datadir, which is
considered as read-only on modern OSes.
Suggestd by Kai Engert in:
https://bugzilla.redhat.com/show_bug.cgi?id=1523630
trust/Makefile.am | 6 ++++-
trust/frob-token.c | 2 +-
trust/module.c | 12 ++++++----
trust/test-module.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++--
trust/test-token.c | 10 ++++----
trust/token.c | 9 ++++++-
trust/token.h | 8 ++++++-
7 files changed, 101 insertions(+), 15 deletions(-)
commit 49d2ededb64197702a8708cb4a453497bc7eaecd
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-31
po: Update translations from transifex
po/LINGUAS | 8 +-
po/ast.po | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ca.po | 171 +++++++++++++++---------------
po/cs.po | 85 +++++++--------
po/da.po | 6 +-
po/de.po | 6 +-
po/el.po | 6 +-
po/en_GB.po | 6 +-
po/eo.po | 6 +-
po/es.po | 12 +--
po/fi.po | 6 +-
po/fr.po | 6 +-
po/fur.po | 343 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/gl.po | 6 +-
po/hr.po | 79 +++++++-------
po/hu.po | 6 +-
po/id.po | 6 +-
po/it.po | 6 +-
po/ja.po | 10 +-
po/ka.po | 6 +-
po/kk.po | 6 +-
po/ko.po | 6 +-
po/lv.po | 6 +-
po/nl.po | 6 +-
po/oc.po | 171 +++++++++++++++---------------
po/pa.po | 8 +-
po/pl.po | 28 ++---
po/pt.po | 171 +++++++++++++++---------------
po/pt_BR.po | 6 +-
po/ru.po | 6 +-
po/sk.po | 6 +-
po/sl.po | 6 +-
po/sr.po | 6 +-
po/sv.po | 6 +-
po/tr.po | 6 +-
po/uk.po | 6 +-
po/zh_CN.po | 8 +-
po/zh_TW.po | 6 +-
38 files changed, 1139 insertions(+), 447 deletions(-)
commit f7387ddea8a5fe609f052a9a40691ebb3ae86372
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-31
build: Add more files to .gitignore
.gitignore | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
commit bb2b064c9921e7bdcd7335ed3001a5e19512d3e1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-31
travis: Exclude generated files from coverage
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3a88f2ed573a5bb04d2397c626f6bcf3b1a814da
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-31
build: Split out generated code from p11-kit/virtual.c
.gitignore | 1 +
Makefile.am | 2 +
configure.ac | 13 ++++
p11-kit/Makefile.am | 34 +++++++++
p11-kit/virtual-fixed.h | 3 -
p11-kit/virtual.c | 197 +-----------------------------------------------
6 files changed, 51 insertions(+), 199 deletions(-)
commit 57697eda68a3343c2e54e5f8f3f4ce65a99383f5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-31
trust: Filter out duplicate extensions
The trust policy module keeps all the objects in the database, while
PKIX doesn't allow multiple extensions identified by the same OID can
be attached to a certificate. Add a check to C_FindObjects to exclude
any duplicates and only return the first matching object.
It would be better if the module rejects such duplicates when loading,
but it would make startup slower.
https://bugzilla.redhat.com/show_bug.cgi?id=1141241
trust/input/extensions.p11-kit | 23 +++++++++++++++++++++
trust/input/extensions.pem | 13 ++++++++++++
trust/module.c | 42 ++++++++++++++++++++++++++++++++++++---
trust/test-module.c | 45 +++++++++++++++++++++++++++++++++++++++++-
trust/test-token.c | 2 +-
5 files changed, 120 insertions(+), 5 deletions(-)
commit 14853b1d8466d4e3b5aa23ff14f2abacd4e7e8ef
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-25
build: Delay compilation of test-related stuff
Makefile.am | 9 ++++++---
common/Makefile.am | 9 ++++++---
p11-kit/Makefile.am | 15 +++++++++------
trust/Makefile.am | 12 ++++++++----
4 files changed, 29 insertions(+), 16 deletions(-)
commit 05b67a36e2118b4485da7bd26ed3ba85efdeddb4
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-25
proxy: Remove dead code
Since the libffi became optional (commit 9f632bed), the fallback code
path in proxy.c has never taken.
p11-kit/proxy.c | 708 --------------------------------------------------------
1 file changed, 708 deletions(-)
commit 3eed501fab5e2a2b19115f4840709c34e9b8ac55
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-16
proxy: Reuse the existing slot ID mapping after fork
While the proxy module reassigns slot IDs in C_Initialize(), some
applications assume that valid slot IDs should never change across
multiple calls to C_Initialize(). This patch mitigates this by
preserving the slot IDs, if they are known to the proxy module.
p11-kit/Makefile.am | 7 +++
p11-kit/fixtures/package-modules/six.module | 7 +++
p11-kit/mock-module-ep4.c | 69 +++++++++++++++++++++++++++++
p11-kit/proxy.c | 25 +++++++++--
p11-kit/test-proxy.c | 18 ++++++++
5 files changed, 122 insertions(+), 4 deletions(-)
commit 031d3c74c0ff5da8e9650da0615bbb8107ab1fde
Author: Daiki Ueno <dueno@redhat.com>
Date: 2018-01-17
server: Avoid null-dereference of timespec value on timeout
Spotted by clang-analyzer.
p11-kit/server.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 50b752e081e1ca8b674d05e8ddeaf04451065629
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-12-22
Added p11-kit remoting page in manual
doc/manual/Makefile.am | 1 +
doc/manual/p11-kit-docs.xml | 1 +
doc/manual/p11-kit-remoting.xml | 253 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 255 insertions(+)
commit 2c84475ca612c33351d9f311ef24b3b89a7c856c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-11-29
build: Add README.md to display build status
README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 3b137039f5c222dbc6688bd6c9aec01a6dbeeece
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-11-28
travis: Exclude test programs from coveralls
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1163e7e1cd3d8b5b42a1d2b463536a36fa0e77af
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-11-27
travis: Supply necessary envvars to container for coveralls
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fda7c32b5796be7cee6a457940110effcd80d7f9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-11-15
travis: Use in-tree build for coverage
The coverage tools (gcov, cpp-coveralls, etc) cannot detect source
files if the project is built out-of-tree. Use the same directory for
$srcdir and $builddir for the build with --enable-coverage.
.travis.yml | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
commit b889dec9e3493efb72c9903bb4d6007ec00e1c89
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-02
test: Improve code coverage of filter.c
p11-kit/test-filter.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
commit 64b96efca97479a67e2ac1fcbf1492fceab64ba8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-02
travis: Use coveralls for measuring coverage
.travis.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit d40d6ca27850a95c4c9df8b66f8a47d80bb1d18a
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: 2017-10-30
p11_kit_override_system_files: introduced new function
That allows overriding the default module and configuration
locations, for use in test suites, etc.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
p11-kit/modules.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/p11-kit.h | 5 +++++
p11-kit/test-transport.c | 13 ++++++++-----
3 files changed, 59 insertions(+), 5 deletions(-)
commit 7f919fc1fd8684000d456ead2e65b3fa19ac0adc
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: 2017-10-30
p11_kit_modules_load*: enhanced documentation on flags
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
p11-kit/modules.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 29b8197e879dc8be8e356f57e6a3a501cdf657f9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-06
build: Take advantage of parallel-tests
.travis.yml | 5 ++++-
Makefile.am | 1 +
configure.ac | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
commit 96a3d3e6371785f846bc72c2a701a1eb67c89b77
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-06
server: Better shell integration
This adds -k, -c, and -s options to the "p11-kit server" command,
which allows you to terminate the server process, select which C-shell
or Bourne shell command line is printed on startup, respectively.
Makefile.am | 6 ++-
p11-kit/Makefile.am | 5 ++
p11-kit/server.c | 122 +++++++++++++++++++++++++++++++++++++++++--------
p11-kit/test-server.sh | 39 ++++++++++++++++
4 files changed, 152 insertions(+), 20 deletions(-)
commit 031912fa844c4f3da327c8b2578d9d9ce2a6473e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-05
server: Make it possible to eval envvar settings
Previously, calling "eval $(p11-kit server)" from shell hung because
the program didn't properly close stdout before forking.
p11-kit/server.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit bda61680218a4ff5a9f05b5592bb282cbedfd936
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-10-02
Release 0.23.9
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 00b829d50389c6a8dd25145355a8e6599a7c378a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-18
trust: Respect anyExtendedKeyUsage in CA certificates
trust/enumerate.c | 5 +++++
trust/oid.h | 9 +++++++++
trust/test-enumerate.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+)
commit f51ab92f5f81bd08bcf9bd3b0afc545684a6ea7e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-09-27
rpc: Fix crash when retrieving attribute length
It is possible that NULL is given to the serializers, when
C_GetAttributeValue() just wants to know the size of an attribute.
Previously, this resulted in giving NULL to memcpy().
p11-kit/rpc-message.c | 10 ++++++----
p11-kit/test-rpc.c | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
commit dcd932786c970fc50922ec4f19786b177481570a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-09-26
server: Make it work only when token URI is provided
Previously, when "p11-kit server" started only with a token URI, it
couldn't properly find and initialize the module which provides the
token. This was because of the wrong order of cleanup of the modules.
p11-kit/rpc-server.c | 88 ++++++++++++++++++++++++----------------------------
1 file changed, 41 insertions(+), 47 deletions(-)
commit 26312a8774b5d113f6e7f904f7b6654449ab7b2e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-18
common: Re-add placeholder definition of p11_debug
This was mistakenly removed in commit efe6dc56c.
Pointed by Lars Wendler in issue #97.
common/debug.h | 4 ++++
1 file changed, 4 insertions(+)
commit 61acf20f26b07e2f3eb253cbfee4c473544df9a7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-16
build: Include <stdint.h> for SIZE_MAX
Fixes issue #95.
common/compat.c | 1 +
1 file changed, 1 insertion(+)
commit 32d6f9d2468ea2851d16ad0e1a2046dfd8cd7fa5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-14
Release 0.23.8
NEWS | 7 +++++++
configure.ac | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 6a137c035c2db373b9171cd7e0569edbe9700f9c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-15
build: Include <stdint.h> for SIZE_MAX
common/array.c | 1 +
1 file changed, 1 insertion(+)
commit 5f0a948ebcf659a1f2c3d5fb30991ebdf73b5976
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-11
client: Fix order of cleanup
In C_GetFunctionList, state->virt is wrapped with a destroyer function
free(). Thus p11_rpc_transport_free must be called before
p11_virtual_unwrap.
p11-kit/client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 04da143dce2d430dcc14e8a45c31177a23d7e301
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-08
test: Add checks for duplicate vendor attributes
p11-kit/test-uri.c | 10 ++++++++++
1 file changed, 10 insertions(+)
commit 992b6000459b9eb5159cb6826b40d7cdb6c4c412
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-08
uri: Make vendor query attribute handling reliable
Previously we used p11_dict to keep track of vendor query attributes.
This had a couple of limitations: duplicate attributes are not allowed
while they are actually allowed in RFC 7512, and the order of
attributes is unpredictable.
This patch switches to using an array instead of p11_dict and ensures
that the attributes are sorted in alphabetical order.
Fixes #88.
p11-kit/uri.c | 104 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 80 insertions(+), 24 deletions(-)
commit c29f51ad8ef97a1fae356dd7660e41d81cde0d09
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-08
common: New p11_array_insert function
common/array.c | 16 ++++++++++++++++
common/array.h | 4 ++++
2 files changed, 20 insertions(+)
commit a860db364521ca6e9046bbf60fbbb1ca2bc08711
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-08-08
common: Use reallocarray instead of realloc as appropriate
reallocarray is a new POSIX function added in glibc 2.26, with
built-in overflow checks. Take advantage of that function for
internal array allocation.
common/array.c | 9 ++++++---
common/attrs.c | 5 ++++-
common/compat.c | 17 +++++++++++++++++
common/compat.h | 8 ++++++++
configure.ac | 1 +
5 files changed, 36 insertions(+), 4 deletions(-)
commit 53402f9e5296718d22ddf1a77658067c2751f068
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-08-01
pkcs11.h: updated information
The scute project no longer exists, and the PKCS#11 standard is
from OASIS group.
common/pkcs11.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 2e5f24b195f11b88825ccdd97af4b8456a2c2a88
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-08-01
pkcs11.h: added OTP-related mechanisms
common/pkcs11.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
commit febad3a45082167a0b882e9b36dc4915d2e0e02c
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-08-01
pkcs11.h: added definitions of GOST CKA attributes
common/pkcs11.h | 3 +++
1 file changed, 3 insertions(+)
commit 2915740f447d0c17f8bcf5fdf4eccd82f2d9fd50
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-07-31
pkcs11.h: added definitions of GOST mechanisms
This follows the definitions in PKCS#11 v2.40:
http://docs.oasis-open.org/pkcs11/pkcs11-curr/v2.40/os/pkcs11-curr-v2.40-os.html
common/pkcs11.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit db1c3cd7eade9ec30163c394b37a4048d2e359af
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-07-03
test: Fix failure on 32-bit big endian platform
The value given to p11_rpc_buffer_add_ulong_value() must be a pointer
of CK_ULONG. Similarly, the value returned from
p11_rpc_buffer_get_ulong_value() must be converted to CK_ULONG before
comparison.
Reported by Andreas Metzler in:
https://lists.freedesktop.org/archives/p11-glue/2017-July/000665.html
p11-kit/test-rpc.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
commit bc1f7570968043ba732922f633c24474565d66c0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-07-14
trust: Fix build error with -Werror=return-type
trust/save.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bc2f4c69bd319313dab9d85a6f8d622501593b0a
Author: Colin Walters <walters@verbum.org>
Date: 2017-07-07
conf: Introduce P11_KIT_NO_USER_CONFIG
Currently `ca-certificates.spec` in Fedora ends up doing in `%post`:
```
/usr/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite --comment $DEST/openssl/ca-bundle.trust.crt
```
etc.
And due to this bit of code in p11-kit, we end up looking for the home
directory for configuration. In this case, `/root`.
It's categorically wrong to do this; the root user is distinct from
"the system". This issue is equivalent to one I fixed in Pango:
https://git.gnome.org/browse/pango/commit/?id=aecbe27c1b08f517c0e05f03308d3ac55cef490c
Fast forward to today, and the reason I'm making this change is I'm working on
`rpm-ostree ex container`, which builds containers as *non-root* (like
gnome-continuous does, but now with RPMs), keeping the invoking uid. And this
bug causes the `ca-certificates` `%post` to fail because it's trying to look for
my uid 1000 which doesn't exist in the target rootfs' password database.
Again, there's no reason to be looking for a home directory for system triggers,
regadless of UID, so once this patch lands, I'll update `ca-certificates` to use
it, and traditional RPM `%post` will stop looking in `/root` too.
p11-kit/conf.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
commit 9dd50249b597109c5956a531e44d46dc344daea5
Author: Fabian Groffen <grobian@gentoo.org>
Date: 2017-06-07
common: always use p11_dl_close wrapper
Solaris doesn't like it when dlclose is referenced using a define,
resulting in a linker error looking for a symbol version. Simply
calling the function in a normal way (instead of storing its address)
solves this linking error.
The error message seen by GNU ld is:
dlclose: invalid version 7 (max 0)
common/compat.c | 17 +++++++++++------
common/compat.h | 6 ++----
2 files changed, 13 insertions(+), 10 deletions(-)
commit 20b9df53cf07c0693257f5f01fa1ff945b4cae4a
Author: Fabian Groffen <grobian@gentoo.org>
Date: 2017-06-07
p11_get_upeer_id: implement case using ucred.h
Solaris can retrieve this information via getpeerucred().
common/unix-peer.c | 19 +++++++++++++++++++
configure.ac | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
commit ca9648c7c1cd38e306d7b3194900e4120eb179a0
Author: Fabian Groffen <grobian@gentoo.org>
Date: 2017-06-07
configure: pull in -lnsl -lsocket for socket functions
Solaris has socket() etc. in these two libs.
configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
commit f992eb64e8cd2925a37ec09d0f5dbd00b5fbb234
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-06-23
Be silent by default and do not print messages on stderr
As p11-kit is a library there are cases where it is not desirable
to log on stderr by default. See for example this report
https://bugzilla.redhat.com/show_bug.cgi?id=1464490
where wget prints an error due to an unconfigured pkcs11 module.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
common/message.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit af2050a585ee3f242230f69de22b643f6ad2200c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-06-12
doc: Use correct PKCS#11 URI syntax
doc/manual/trust.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b309aea5174d6d3af569c2c54632a35825734579
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-06-09
build: Allow use of _GNU_SOURCE
This reverts commit 6b457ffc, which forbids the use of GNU extension
for the incompatibility of strerror_r. However, now that strerror_l
is used instead on glibc systems, it has no point to do that.
common/compat.h | 4 ----
common/unix-peer.c | 5 -----
configure.ac | 3 +++
3 files changed, 3 insertions(+), 9 deletions(-)
commit efe6dc56c3951c301dda1b548d4cbcd02e074462
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-06-12
debug: Add p11_debug_err to prevent use of strerror
common/debug.c | 35 +++++++++++++++++++++++++++++++++++
common/debug.h | 15 +++++++++++++--
p11-kit/rpc-transport.c | 2 +-
3 files changed, 49 insertions(+), 3 deletions(-)
commit bf3c1a9d8e4ace4c3a92b4af56e4b62657907522
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-06-09
compat: Prefer strerror_l to strerror_r
strerror_r is being obsolete in the next POSIX specification:
http://austingroupbugs.net/view.php?id=655
common/message.c | 15 ++++++++++++++-
configure.ac | 4 ++--
2 files changed, 16 insertions(+), 3 deletions(-)
commit bf168f00e64a0291f5a718eb451915768659c160
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
Release 0.23.7
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit fe1faa9d814a180d432e4ee97fa5b097cfb2d294
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
trust: Suppress dead-assignment warnings from clang-analyzer
trust/digest.c | 1 +
trust/extract-openssl.c | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
commit b7ba8c625637f3a161cafd81c4a8a30b1f3971b3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
rpc: Avoid use-after-free when creating socket base directory
Spotted by clang-analyzer.
p11-kit/server.c | 1 -
1 file changed, 1 deletion(-)
commit a2a2108fce9a5cebaee17f29bda8d9edf6a0fbc8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
rpc: Avoid calling memcmp() on NULL buffer
Spotted by clang-analyzer.
p11-kit/rpc-message.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 3e65d8a23b1f0e1a4d132cf04fdbc9d588cbe02f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
proxy: Don't call realloc() with size 0
Spotted by clang-analyzer.
p11-kit/proxy.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
commit 350bd148d3181c564eeb884dadc37aaed7d3fb9b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
build: Delay building test programs until "make check"
This is to disable clang-analyzer against test programs, which can
contain several false-positives.
Makefile.am | 7 +++----
common/Makefile.am | 2 +-
p11-kit/Makefile.am | 4 ++--
trust/Makefile.am | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
commit 6738ade89f10516b589441282e95d5f13f6c1bdd
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
travis: Enable clang-analyzer
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit cd64b9a7cb4b9f0030d17917370f50753671b93a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-29
server: Avoid use-after-free
Reported by Mantas Mikulėnas in:
https://bugs.freedesktop.org/show_bug.cgi?id=101212
p11-kit/server.c | 1 -
1 file changed, 1 deletion(-)
commit 9cbf590b468f9596284c5bc34be8add09f3f5bee
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-26
Release 0.23.6
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 80e3ce9eff5094c2c40905e2cb8b86c4aaf2329b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-26
test: Check the size of unsigned long
configure.ac | 2 ++
p11-kit/test-rpc.c | 18 +++++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
commit 4de8f7a9c4f8010069402ce943e5d777cd1f3c28
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-26
rpc: Load advapi32.dll on the fly
p11-kit/Makefile.am | 7 -----
p11-kit/server.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 7 deletions(-)
commit 95b67e71e19a8415808b5ddf14f253561f11466f
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-26
remote: Remove unnecessary declaration
p11-kit/remote.h | 4 ----
1 file changed, 4 deletions(-)
commit 036c8fc6492b13eacca7433ca44b91b83abeb961
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-26
doc: Clarify p11-kit server documentation
doc/manual/p11-kit.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
commit dd673f20e1ab4916f7565fe055b09433aa88a9b0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-03-09
server: Port to Windows
Instead of a Unix domain socket on Unix, use a named pipe on Windows.
p11-kit/Makefile.am | 9 +-
p11-kit/server.c | 541 ++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 511 insertions(+), 39 deletions(-)
commit da7f0d65355089f4919bcdffca98bd833258db04
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-03-10
rpc: New p11_kit_remote_serve_tokens function
doc/manual/p11-kit-sections.txt | 1 +
p11-kit/remote.c | 118 +++++++++++++--------------------
p11-kit/remote.h | 14 ++++
p11-kit/rpc-server.c | 142 ++++++++++++++++++++++++++++++++++++++++
p11-kit/server.c | 74 +++++++++++++--------
5 files changed, 248 insertions(+), 101 deletions(-)
commit 7310d92af3b0291ab627fcf3e07800cd5b2983c8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-03-10
remote: Name command line options consistently
p11-kit/remote.c | 4 +-
p11-kit/server.c | 183 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 116 insertions(+), 71 deletions(-)
commit dfe606d40c33a6213b89b310df0964392fd6d64d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-23
rpc: Convert mechanism parameters for portability
This is similar to commit ba49b85e, but for mechanism parameters.
p11-kit/rpc-client.c | 153 +---------------------
p11-kit/rpc-message.c | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.h | 31 +++++
p11-kit/rpc-server.c | 33 +++--
p11-kit/test-rpc.c | 66 ++++++++++
5 files changed, 467 insertions(+), 158 deletions(-)
commit 3b484b87e13e52873ea48f920132ecd96cb79cbc
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-23
pkcs11: Define RSA-PSS mechanism parameter
common/pkcs11.h | 11 +++++++++++
1 file changed, 11 insertions(+)
commit c11a951a24b91f80e109951b0fe2ce418ea70f17
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-23
pkcs11: Make CK_RSA_PKCS_OAEP_PARAMS useful
common/pkcs11.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 9e4ea3ff80b736bddbca834eef7e7f61f4b15c23
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-23
rpc: Fix typo in encoding CK_DATE value
p11-kit/rpc-message.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 41b07cdf4210b299dc6c92352475c7c095f6f915
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-23
rpc: Factor out attribute value serializer definitions
p11-kit/rpc-message.c | 51 +++++++++++++++++++++++++--------------------------
1 file changed, 25 insertions(+), 26 deletions(-)
commit f6112aa79a251079aef344d77cbe172031db1e8b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-24
rpc: Add a comment why we call _get_attribute() twice
p11-kit/rpc-server.c | 1 +
1 file changed, 1 insertion(+)
commit ba49b85ecf280e7fb6eec96c3ef33c50122e75a6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-11
rpc: Convert attribute value for portability
When using the RPC across multiple architectures, where data models
are different, say LP64 vs ILP32, there can be unwanted truncation of
attribute values.
This patch converts the values into portable format for the known
attributes.
Co-authored-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
p11-kit/rpc-client.c | 63 +++----
p11-kit/rpc-message.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++++--
p11-kit/rpc-message.h | 77 ++++++++
p11-kit/rpc-server.c | 35 ++--
p11-kit/test-rpc.c | 223 +++++++++++++++++++++-
5 files changed, 827 insertions(+), 80 deletions(-)
commit 480337a68446033dc9374e9c4fe4d3cae9d4e972
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-22
rpc: Return early if call_id of request is ERROR
Otherwise it will cause assertion failure in a few lines below.
Spotted by amrican fuzzy lop.
p11-kit/rpc-message.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 8b64577c3bb4d5dd60e4939223550f2f2002284b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-22
build: Add fuzzer using AFL
build/fuzz/main.c | 44 ++++++++++++++++++++++++++++++++++++
build/fuzz/rpc.in/transcript | Bin 0 -> 146 bytes
build/fuzz/rpc_fuzzer.c | 52 +++++++++++++++++++++++++++++++++++++++++++
build/fuzz/run-afl.sh | 46 ++++++++++++++++++++++++++++++++++++++
build/fuzz/transcript | Bin 0 -> 5694933 bytes
5 files changed, 142 insertions(+)
commit 723dfeb3dd9b8426c4c1d6236f4b22354c122dae
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-18
trust: Simplify the check for the magic
Instead of reusing the CKA_X_GENERATED attribute, check the file
contents directly in the caller side.
trust/parser.c | 7 +++----
trust/persist.c | 19 +++++++++++--------
trust/persist.h | 3 +++
3 files changed, 17 insertions(+), 12 deletions(-)
commit 66c6a7e912d39d66cd4cc91375ac7be418bf7176
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-18
trust: Check magic comment in persist file for modifiablity
A persistent file written by the trust module starts with the line "#
This file has been auto-generated and written by p11-kit". This can
be used as a magic word to determine whether the objects read from a
.p11-kit file are read-only.
trust/parser.c | 6 +++++-
trust/persist.c | 9 ++++++++-
trust/test-token.c | 1 +
3 files changed, 14 insertions(+), 2 deletions(-)
commit acf8c4a91a76bf8049f6bfbd95b04e2e36bae4ea
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-05-18
Revert "trust: Honor "modifiable" setting in persist file"
This reverts commit 8eed1e60b0921d05872e2f43eee9088cef038d7e, which
broke "trust anchor --remove".
trust/input/verisign-v1.p11-kit | 1 -
trust/parser.c | 10 +---------
trust/test-parser.c | 1 -
3 files changed, 1 insertion(+), 11 deletions(-)
commit 5a52fe4fa8dffdaf33cd024e1a4b18c8facb451c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-03-09
remote: Fix typo when writing a credential byte
out_fd is not always 1 when p11_kit_remote_serve_module() is used for
writing a custom server.
p11-kit/rpc-server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 13160c1f95758387dffc41345e20d89ff9b5a5c0
Author: Daniel Black <danielgb@au.ibm.com>
Date: 2017-03-06
correct text for --user-config option
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 817a1c67c407850ab1756fdacb1c38e4bded5509
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-03-01
Release 0.23.5
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit a827b55fed09b72ffd0e176c6630cb7b591c6e04
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-28
build: Remove systemd unit files for now
Given that the remote proxy service shall be only used by NetworkManager
and not generally useful, revert commit
a4fb2bb587fb1a0146cf97f039b671d3258488f9 for now.
Once the necessary command that runs the proxy module is implemented in
p11-kit, maybe NetworkManager itself could install those files.
p11-kit/Makefile.am | 19 -------------------
p11-kit/p11-kit-remote.socket | 10 ----------
p11-kit/p11-kit-remote@.service.in | 10 ----------
3 files changed, 39 deletions(-)
commit 7053ace4ae5b3e2129e5a8ffe482420bfc14f894
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-24
systemd: Fix location of p11-kit-remote
The p11-kit-remote executable is now located under $libexecdir, but we
should use the p11-kit command to launch the subcommand.
Makefile.am | 2 ++
configure.ac | 1 -
p11-kit/Makefile.am | 8 ++++++++
p11-kit/p11-kit-remote@.service.in | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
commit 156b0c9249f6da54195d2a6a817ea92552e78bf8
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2017-02-27
fixed license in unix peer file
common/unix-peer.c | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)
commit b674c94029fd2012d8a5cba13a9e7b8dd097ac56
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2017-02-23
build: add missing includes for FreeBSD
Include signal.h for kill(2) and SIGKILL on FreeBSD.
p11-kit/test-transport.c | 1 +
1 file changed, 1 insertion(+)
commit bc6fec4422ddc84541776b6f0cfca1542e28f350
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2017-02-23
build: check for getpeereid
In common/unix-peer.c, we are checking if HAVE_GETPEEREID is defined,
however, we never actually check if getpeereid() is available, so
fix that by checking this function using AC_CHECK_FUNCS().
configure.ac | 1 +
1 file changed, 1 insertion(+)
commit 54d9f0799e32796f8e762d8b58ecd4e3dd3fef82
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-17
Release 0.23.4
NEWS | 17 +++++++++++++++++
configure.ac | 6 +++---
2 files changed, 20 insertions(+), 3 deletions(-)
commit 1e80b5858a90497879e1e3faee4c7f76d5cbd6f0
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-20
uri: Support vendor query attributes
If an unknown attribute is present in the query part of the PKCS#11 URI,
the parser treated it as unrecognized and subsequent matches failed.
Instead, keep track of such attributes and provide a set of API to deal
with them.
doc/manual/p11-kit-sections.txt | 2 +
p11-kit/test-uri.c | 40 ++++++++++++++++
p11-kit/uri.c | 100 +++++++++++++++++++++++++++++++++++++++-
p11-kit/uri.h | 6 +++
4 files changed, 146 insertions(+), 2 deletions(-)
commit eb65a85a4abfbab489f271c9f074409ba46ce8f5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-21
rpc: Make it less verbose about connection failure
The connection failure here is not fatal. Use p11_debug() instead of
p11_message().
p11-kit/rpc-transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c65752d596e69f48ebe67694cfb2a91697a676bf
Author: Mantas Mikulėnas <grawity@gmail.com>
Date: 2017-02-20
rpc: Try $XDG_CACHE_HOME before ~/.cache
This is unset on most systems, but might as well follow the Base
Directory spec properly.
p11-kit/client.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 8eed1e60b0921d05872e2f43eee9088cef038d7e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-17
trust: Honor "modifiable" setting in persist file
Previously, all objects read from p11-kit persist files are marked as
modifiable when parsing, regardless of the explicit "modifiable: false"
setting in the file.
Reported by Kai Engert in:
https://bugs.freedesktop.org/show_bug.cgi?id=99797
trust/input/verisign-v1.p11-kit | 1 +
trust/parser.c | 10 +++++++++-
trust/test-parser.c | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
commit 0684cd7b7f815b411ea5041c021f92ca5ef42606
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-11
rpc: Add PKCS#11 module that connects to socket
This patch adds a PKCS#11 module that connects to the p11-kit server
exposed on the filesystem. The filename of the socket is determined in
the following order:
- $P11_KIT_SERVER_ADDRESS, if the envvar is available
- $XDG_RUNTIME_DIR/p11-kit/pkcs11, if the envvar is available
- /run/$(id -u)/p11-kit/pkcs11, if /run/$(id -u) exists
- /var/run/$(id -u)/p11-kit/pkcs11, if /var/run/$(id -u) exists
- ~/.cache/p11-kit/pkcs11.
Note that the program loading this module may have called setuid() and
secure_getenv() which we use for fetching envvars could return NULL.
Makefile.am | 3 +
doc/manual/Makefile.am | 1 +
doc/manual/p11-kit.xml | 17 ++++
p11-kit/Makefile.am | 58 ++++++++++---
p11-kit/client-init.c | 109 +++++++++++++++++++++++++
p11-kit/client.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/client.h | 41 ++++++++++
p11-kit/modules.c | 10 +++
p11-kit/proxy-init.c | 98 ++++++++++++++++++++++
p11-kit/remote.c | 2 +-
p11-kit/util.c | 57 -------------
trust/Makefile.am | 3 +-
12 files changed, 543 insertions(+), 71 deletions(-)
commit c28ff652e5d6c6ddff513716e22064e0e17a58d3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-25
remote: Add API to serve a token
doc/manual/p11-kit-sections.txt | 1 +
p11-kit/remote.h | 5 +++++
p11-kit/rpc-server.c | 37 +++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
commit 426b693aa7fe2e9750abf8cb39f28251a4b54668
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-26
remote, server: Recognize PKCS#11 URI
p11-kit/remote.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 69 insertions(+), 8 deletions(-)
commit 4bac7e0e95712a4c7bfd03471c973f491ad81df4
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2016-08-24
p11-kit: Add 'p11-kit server' command
This adds a new tool to the p11-kit command called 'server', which
allows us to access a PKCS#11 module over a Unix domain socket.
Internally, it is implemented as a wrapper around 'p11-kit remote'.
Upon connection it executes 'p11-kit remote' in a forked process.
configure.ac | 3 +
p11-kit/Makefile.am | 14 ++
p11-kit/server.c | 578 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 595 insertions(+)
commit f2742c72bc29444bcfe63425819506fa42073d64
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2016-08-24
common: New p11_get_upeer_id() function
common/Makefile.am | 6 ++++
common/unix-peer.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/unix-peer.h | 42 +++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
commit 89fa381ce5573a925b90da973cd8956937d79caa
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2016-08-24
rpc: New rpc_unix transport based on Unix socket
p11-kit/rpc-transport.c | 89 +++++++++++++++++++++++++++++++++++
p11-kit/test-transport.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 207 insertions(+)
commit 3bab48000c4e61104b30ac379806cad3e1376ea6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-25
common: Add path encoding functions
This adds p11_path_{encode,decode}(), following the escaping rule
described in:
https://dbus.freedesktop.org/doc/dbus-specification.html#addresses
Although they are merely a wrapper around p11_url_{decode,encode}(),
having dedicated functions hides the implementation details.
common/path.c | 33 +++++++++++++++++++++++++++++++++
common/path.h | 4 ++++
common/test-path.c | 22 ++++++++++++++++++++++
3 files changed, 59 insertions(+)
commit 5442b1cfa13da9307cc38a8fd289a67a05fe26ad
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
travis: Enable mingw64 cross build
.travis.yml | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
commit 98f02ef5ebf6966af4937dd2f730d808f13d8a1c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-16
trust: Fix uninitialized value in anchor command
trust/anchor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6dfa59954d882971e4516192f18319cbc75b5e4b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-16
library: Initialize p11_virtual_mutex for Windows
common/library.c | 2 ++
1 file changed, 2 insertions(+)
commit 8594841ed349818bb8cb43a57b734a7945427c64
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-16
test: Fix modules test for Windows
Synchronize the fixture module to the non-Unix one and enable
"/modules/test_filename".
p11-kit/fixtures/system-modules/win32/one.module | 4 +++-
p11-kit/test-modules.c | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
commit 63b31ebfa1a978789cb31635fd95d00d7e398fa2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
trust: Fix saving trust file on Windows
trust/save.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
commit 99aabc614cce4e0a9751d9409546c34abc1fe2db
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
test: Fix Windows test case for p11_path_expand
common/test-path.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b534f1801d82c565e38305b2ed73dd00dc165f65
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
rpc: Port exec transport to Windows
On Windows, use _spawnv() to create a subprocess and two unidirectional
pipe created with _pipe() to communicate with it. If we can assume
WinSock, it might be simpler to use a socketpair() replacement from:
https://github.com/ncm/selectable-socketpair.
p11-kit/rpc-transport.c | 275 ++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 245 insertions(+), 30 deletions(-)
commit 46e35810f8e9774bd5984b9fcb6d92450bf6ba0a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
build: Adjust executable/module names for Windows
Append EXEEXT or SHLEXT to the filename if needed.
configure.ac | 2 ++
p11-kit/p11-kit.c | 7 ++++++-
p11-kit/test-transport.c | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
commit 69293e9e894c9a3141f8d59e78a81b3fcf2beb28
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-01
build: Avoid undefined reference to rpc_exec_init
p11-kit/rpc-transport.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 7b5ad15a68ab7fc0a0cb051f641120c6301694a7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-01
build: Include <unistd.h> for execv
trust/extract.c | 1 +
1 file changed, 1 insertion(+)
commit b78bc9304b21da16312473b1f4dc0f8870fb8df9
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-01
build: Check *asprintf on all platforms
configure.ac | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit b16500f93407aef72445b03c1ee96c6768917906
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-15
argv: Fix misinterpretation of backslash in quotes
Don't append the backslash character twice to the output. It is
interpolated a few lines below, if it is really required.
common/Makefile.am | 4 ++
common/argv.c | 2 +-
common/test-argv.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 1 deletion(-)
commit 873d391fa5015e8c5c82457a0641ed5bb1e2b7e3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-16
compat: Fix character generation in mk{s,d}temp()
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b8f1e4febe31f18bf63a3a9ad0e336ede82dd0f1
Author: Kai Engert <kaie@kuix.de>
Date: 2017-02-02
Fix a typo in "x-cetrificate-value", see also https://bugs.freedesktop.org/show_bug.cgi?id=99600
common/constants.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit dbadd5da6ccbb17ec5c4bbb142fdc244b4903bfb
Author: Kai Engert <kaie@kuix.de>
Date: 2017-02-02
Support loading new NSS attribute CKA_NSS_MOZILLA_CA_POLICY from .p11-kit files.
See also NSS bug https://bugzilla.mozilla.org/show_bug.cgi?id=1334976
and p11-kit bug https://bugs.freedesktop.org/show_bug.cgi?id=99453
common/constants.c | 1 +
common/pkcs11x.h | 1 +
trust/builder.c | 1 +
trust/persist.c | 1 +
4 files changed, 4 insertions(+)
commit ee740e904030c3fb2640f524014474a510dda7eb
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-16
library: Deinit p11_virtual_mutex
Follow-up fix for commit 4d228aa0, which forgot to clear
p11_virtual_mutex on library finalization.
common/library.c | 1 +
1 file changed, 1 insertion(+)
commit 4d228aa0129bcafb97d7196d8c18e379b492406d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-14
virtual: Move mutex into p11_library_init()
We used to provide p11_virtual_fixed_{,un}init() to only initialize a
mutex used in virtual.c. That required all the tests calling virtual
functions to call p11_virtual_fixed_{,un}init() in main().
For simplicity, move the mutex variable initialization into
p11_library_init().
common/library.c | 3 +++
common/library.h | 3 +++
p11-kit/util.c | 5 -----
p11-kit/virtual-fixed.h | 3 ---
p11-kit/virtual.c | 27 +++++----------------------
5 files changed, 11 insertions(+), 30 deletions(-)
commit 1ea08989cecee217befd3b964b5a4f0d584e2a29
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-02-13
trust: Revert to the original 'extract' behavior
Since commit f4384a40, due to a missing ex->flags setting, the 'trust
extract' command didn't retrieve correlation between related objects and
that was causing assertion failure when writing PEM files.
https://bugs.freedesktop.org/show_bug.cgi?id=99795
trust/extract.c | 1 +
1 file changed, 1 insertion(+)
commit fd9b5c19485e2b88150696b523d889df2ed41cba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-13
filter: New virtual wrapper for access control
doc/manual/Makefile.am | 1 +
p11-kit/Makefile.am | 5 +
p11-kit/filter.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/filter.h | 55 +++++++
p11-kit/test-filter.c | 143 +++++++++++++++++
5 files changed, 624 insertions(+)
commit 3d54011b0d0bf1b31fbab8d7025b7201722d61c3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-17
iter: Enable iteration over slots/tokens/modules
While PKCS#11 URI can identify slots/tokens/modules, P11KitIter is only
capable of iterating over objects.
This patch adds new behaviors to P11KitIter to support iterations over
slots/tokens/modules, using the C coroutine trick as described in:
http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
doc/manual/p11-kit-sections.txt | 2 +
p11-kit/iter.c | 149 +++++++++++++++++++++++++++++++-------
p11-kit/iter.h | 16 +++-
p11-kit/test-iter.c | 157 +++++++++++++++++++++++++++++++++++++++-
4 files changed, 297 insertions(+), 27 deletions(-)
commit 77913af71be81208b4e9af68cd10bc55669543e1
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-23
uri: Relax pin-* parsing for compatibility
While 'pin-source' and 'pin-value' are defined as query atttribute, they
were defined as path attribute in earlier drafts, and some
implementations still stick to it.
For backward compatibility, accept those in path attributes when
parsing (but not when formatting).
Reported by Andreas Metzler in:
https://lists.freedesktop.org/archives/p11-glue/2017-January/000637.html
p11-kit/uri.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
commit cfa9fefb2b4c4d8c1d38284817c61dcf5d3f4716
Author: Stef Walter <stefw@redhat.com>
Date: 2017-01-29
trust: Implement a 'trust dump' command
This dumps all the PKCS#11 objects in the internal .p11-kit
persistence format.
This is part of the trust command and tooling, even though
at some point it could go in the p11-kit command. The reason
for this is that the code related to the internal .p11-kit
objects is in the trust code, and consumed solely by the
trust related modules.
doc/manual/trust.xml | 39 +++++++++++
trust/Makefile.am | 1 +
trust/dump.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++
trust/dump.h | 43 ++++++++++++
trust/trust.c | 2 +
5 files changed, 276 insertions(+)
commit 2a46d81d84682181e0108ff2e5f973f7a319d25f
Author: Stef Walter <stefw@redhat.com>
Date: 2017-01-29
trust: Don't encode spaces when writing .p11-kit format
These should not be encoded by default for readability in
strings.
trust/persist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6caa48db1cab9a4d680062edcd139d9625c5aa7f
Author: Stef Walter <stefw@redhat.com>
Date: 2017-01-29
trust: Add an "all" filter option for trust commands
trust/enumerate.c | 3 +++
1 file changed, 3 insertions(+)
commit f4384a40657e6abde6658ac7600abb879818b493
Author: Stef Walter <stefw@redhat.com>
Date: 2017-01-29
trust: Make extraction and correlation of certificate info optional
This is so that the code can be shared by the upcoming 'trust dump'
command where correlation between related objects is not desired.
trust/enumerate.c | 28 +++++++++++++++-------------
trust/enumerate.h | 1 +
trust/list.c | 1 +
trust/test-bundle.c | 1 +
trust/test-cer.c | 1 +
trust/test-enumerate.c | 16 ++++++++++------
trust/test-openssl.c | 1 +
7 files changed, 30 insertions(+), 19 deletions(-)
commit d5a2d993c8e983290aea33fac2a086240af39c6b
Author: Stef Walter <stefw@redhat.com>
Date: 2017-01-29
trust: Load all attributes for each object when enumerating
We load all known attributes for each object we're enumerating
over in the 'trust list' and 'trust extract' commands.
trust/enumerate.c | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
commit 9bb1613011370b00c7b561d7de30c205a246a586
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-25
virtual: Make virtual-fixed internal API cleaner
Add proper inclusion guard to virtual-fixed.h and move the declarations
of the (un)initialization functions there.
p11-kit/util.c | 10 +++++-----
p11-kit/virtual-fixed.h | 9 +++++++++
p11-kit/virtual.c | 4 ++--
p11-kit/virtual.h | 4 ----
4 files changed, 16 insertions(+), 11 deletions(-)
commit 08ecac9deb63904c6482eab64198580aac9e1a4e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-25
test: Release transport mock module
To prevent leaks of fixed closures, p11_kit_module_release() needs to be
called on the mock module itself.
p11-kit/test-transport.c | 1 +
1 file changed, 1 insertion(+)
commit c01b59e5594b395cf084068e513a68f63c9b95a4
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2016-11-30
test: Check exhaustion of fixed closures
p11-kit/test-managed.c | 49 +++++++++++++++++++++++++++++++++++++++++++++----
p11-kit/test-modules.c | 38 +++++++++++++++++++++++++++++++++++++-
2 files changed, 82 insertions(+), 5 deletions(-)
commit 9f632bed73c8800af16a69c97bd4c315bd350f8b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-26
build: Make libffi closure optional
libffi's closure support is not available on all platforms and may fail
at run time if running under a stricter SELinux policy. Fallback to
pre-compiled closures if it is not usable.
https://bugs.freedesktop.org/show_bug.cgi?id=97611
configure.ac | 11 -
doc/manual/Makefile.am | 1 +
p11-kit/Makefile.am | 5 +-
p11-kit/modules.c | 26 +-
p11-kit/proxy.c | 2 +-
p11-kit/test-init.c | 12 +-
p11-kit/test-virtual.c | 1 -
p11-kit/util.c | 5 +
p11-kit/virtual-fixed.h | 1135 +++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/virtual.c | 614 ++++++++++++++++++++-----
p11-kit/virtual.h | 6 +-
11 files changed, 1662 insertions(+), 156 deletions(-)
commit 91861f634a1299af28a29de70c45f469562123f6
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-23
maint: Add .dir-locals.el file for Emacs
.dir-locals.el | 1 +
1 file changed, 1 insertion(+)
commit 7f6488fc95a2cbd3b8012923d6fd522a83ae6bba
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-23
travis: Enable strict code compilation
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1e0bc1f164ce73f9feeeb14754d09072b3e9bc68
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2017-01-21
Fix compiler warnings on FreeBSD
* common/compat.c: Fix "implicit declaration of function 'issetugid'"
warning. On FreeBSD, it's required to define __BSD_VISIBLE to make
issetugid(2) visible
* common/test-message.c: Fix "implicit declaration of function
'asprintf'" by including <stdio.h>
* p11-kit/test-iter.c: Fix "format '%lu' expects argument of
type 'long unsigned int', but argument 3 has type 'int'" by
changing format string to "%d"
common/compat.c | 4 ++++
common/test-message.c | 1 +
p11-kit/test-iter.c | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
commit a4fb2bb587fb1a0146cf97f039b671d3258488f9
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: 2016-12-08
systemd: add per-user remoting socket
This allows daemons outside user's session to use per-user PKCS#11
modules. Useful for letting VPN daemons or wpa_supplicant use
certificates stored in user's GNOME keyring, etc.
.gitignore | 1 +
configure.ac | 1 +
p11-kit/Makefile.am | 11 +++++++++++
p11-kit/p11-kit-remote.socket | 10 ++++++++++
p11-kit/p11-kit-remote@.service.in | 10 ++++++++++
5 files changed, 33 insertions(+)
commit 563606efe17cbf3b84679f5e54f60b8d68ba9015
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: 2015-11-03
common: use recursive pthread mutex for library lock
This allows us to do nested locking within one thread avoiding a lockup
when remoting the p11-kit-proxy.so module:
#0 0x00007f190f35838d in __lll_lock_wait () from /lib64/libpthread.so.0
#1 0x00007f190f351e4d in pthread_mutex_lock () from /lib64/libpthread.so.0
#2 0x00007f190f98657f in C_GetFunctionList (list=0x7ffe7ec3f798) at p11-kit/proxy.c:2355
#3 0x00007f190f993cc9 in dlopen_and_get_function_list (funcs=0x7ffe7ec3f798, path=0x7ffe7ec40926 "/usr/local/lib/p11-kit-proxy.so", mod=0x249e3d0) at p11-kit/modules.c:337
#4 load_module_from_file_inlock (name=name@entry=0x0, path=path@entry=0x7ffe7ec40926 "/usr/local/lib/p11-kit-proxy.so", result=result@entry=0x7ffe7ec3f7e8) at p11-kit/modules.c:382
#5 0x00007f190f99587f in p11_kit_module_load (module_path=module_path@entry=0x7ffe7ec40926 "/usr/local/lib/p11-kit-proxy.so", flags=flags@entry=0) at p11-kit/modules.c:2427
#6 0x0000000000401c4b in serve_module_from_file (file=0x7ffe7ec40926 "/usr/local/lib/p11-kit-proxy.so") at p11-kit/remote.c:105
#7 main (argc=1, argv=<optimized out>) at p11-kit/remote.c:169
The Windows NT mutex is aready recursive by default.
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit cfc654b2a532aa1adf3cda4bdee8b1397920f912
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-18
uri: Support query attributes to specify module
Accept and produce 'module-name' and 'module-path' query attributes
defined in RFC 7512.
doc/manual/p11-kit-sections.txt | 4 ++
p11-kit/test-uri.c | 115 ++++++++++++++++++++++++++++++++++++++
p11-kit/uri.c | 121 +++++++++++++++++++++++++++++++++++++---
p11-kit/uri.h | 10 ++++
4 files changed, 241 insertions(+), 9 deletions(-)
commit a126365a49547da6b532210a886bb5d5fc531b77
Author: Daiki Ueno <dueno@redhat.com>
Date: 2017-01-16
uri: Avoid typecasting confusion on s390x
Like memcpy(), the 'void *' argument of p11_buffer_add() points to the
memory area ordered in host's endianness. Add typecast of int->char to
avoid the confusion.
Reported by Andreas Metzler in:
https://lists.freedesktop.org/archives/p11-glue/2017-January/000633.html
p11-kit/uri.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit 726c08847c263af9c9fd8c74aea738612795dbb6
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: 2016-12-28
uri: fix producing the query attributes
Put the pin-* attributes where they belong: to the query part.
p11-kit/test-uri.c | 2 +-
p11-kit/uri.c | 81 +++++++++++++++++++++++++++++++-----------------------
2 files changed, 48 insertions(+), 35 deletions(-)
commit cbf1e42e39c030edb3e2c72ae9b4d7dd7ccf3eea
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: 2016-12-28
uri: fix the query attribute parsing
The pin-* attributes belong to the query part. We should not parse them
until we see a '?' and they're separated with a '&'.
This might be an important thing -- some of the query attributes may
have security implications reaching outside scope of the token itself, to the
host system itself. E.g. a pin-source may cause the consumer to access a file
or module-path (unimplemented) execute code. The user may want to just chop the
attribute part off if they want the consumer access the token and not take the
security considerations into account.
p11-kit/test-uri.c | 6 +++---
p11-kit/uri.c | 50 +++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 42 insertions(+), 14 deletions(-)
commit 287ae8c14145d9cef55079e4de36b1607176cf89
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2017-01-07
build: improve p11-kit-proxy symlink handling
- Current command for creation of the p11-kit-proxy symlink
uses shell brace expansion that isn't supported by all
the shells (e.g. FreeBSD's /bin/sh does not support that).
Replace it with the old-fashioned 'for' loop
- Match extension of the source and the target, i.e. so links
to so, dylib links to dylib (previously dylib linked to so)
- Add an uninstall-local target to clean up the symlink
p11-kit/Makefile.am | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
commit 794385d24fe794455798946ce9de1e2280e78a8c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-13
Release version 0.23.3
NEWS | 10 ++++++++++
configure.ac | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
commit 62d7cd6a0e1ce76b2dd6c5a44933cee1bac93c19
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-19
doc: More tweaks for gtk-doc
doc/manual/p11-kit-sections.txt | 7 +++++++
1 file changed, 7 insertions(+)
commit eb6433f0d1406d3dda42c98fa94060cab5d5d0ac
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-19
doc: Mention new API functions
doc/manual/p11-kit-sections.txt | 6 ++++++
1 file changed, 6 insertions(+)
commit 4442748b1cbb4da4f355ece6d498a2272e2c7238
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2016-12-15
rpc: Fix typo flagged by lintian
p11-kit/rpc-server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9773fa8ca877d305a5dea26d07cfcfc445232ae2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-13
test: Remove setgid()ed copy of frob-getenv
Otherwise the file is left in builddir, after make distclean.
common/test-compat.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 5af8da1f4949807925e23b866f6280dcf7d74f87
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-13
test: Fix privatedir substitution in test-extract
Since $privatedir expands to "${libexecdir}/p11-kit", $libexecdir must
be substituted in the script beforehand.
trust/test-extract.in | 1 +
1 file changed, 1 insertion(+)
commit 352d2090628d6a040846508e51de06318b69a475
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-06
pkcs11: Update CRYPTOKI_VERSION to 2.40
common/pkcs11.h | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
commit 5287a57b9e6d96504af4ad0f989328397f845d55
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-06
pkcs11: Add CK_RSA_PKCS_OAEP_PARAMS definition
https://bugzilla.redhat.com/show_bug.cgi?id=1191209
common/pkcs11.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
commit 15a28b263f37de4796899dff04bcf3886f9d010e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-06
pkcs11: Add CKA_COPYABLE definition
https://bugzilla.redhat.com/show_bug.cgi?id=1191231
common/pkcs11.h | 1 +
1 file changed, 1 insertion(+)
commit ccc81bbfaffb5617a509126b8f882b6c930434e3
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-06
pkcs11: Add AES key wrap mechanisms
https://bugzilla.redhat.com/show_bug.cgi?id=1191231
common/pkcs11.h | 3 +++
1 file changed, 3 insertions(+)
commit b034e8601036c41acfcbd39f12fcd4bfb75dfd13
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2016-09-20
proxy: Remove redundant NULL check
https://bugs.freedesktop.org/show_bug.cgi?id=93589
p11-kit/proxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f8ff3bec65e31dad1cabe0bd3e2f1fae9ef77f40
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2016-09-20
modules: Remove redundant NULL check
https://bugs.freedesktop.org/show_bug.cgi?id=93588
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 873e52cc72701f7a5714a5006f15810ba5981d10
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2016-09-20
proxy: Check return value of calloc()
https://bugs.freedesktop.org/show_bug.cgi?id=92815
p11-kit/proxy.c | 1 +
1 file changed, 1 insertion(+)
commit 2cf22900bbcb3a0f3d11b56ad262bef33e997a00
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2016-09-20
mock: Check return value of calloc()
https://bugs.freedesktop.org/show_bug.cgi?id=92813
common/mock.c | 1 +
1 file changed, 1 insertion(+)
commit 694c95d8da89e2f6aae47c7c379b3c0e2b9adbe8
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-12-06
doc: State 'p11-kit trust' is a deprecated form
https://bugzilla.redhat.com/show_bug.cgi?id=1160783
doc/manual/p11-kit.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
commit b3418c2f0d223955723df7d65a31026ad038d943
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-23
trust: Don't add CKA_TRUSTED to extension object
While 'trust anchor' command tries to add CKA_TRUSTED attribute to any
object, it is only valid for a certificate object.
https://bugzilla.redhat.com/show_bug.cgi?id=1158926
trust/anchor.c | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
commit 65e8ad30e7832f3a979f88f4308cfa4f9a969829
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-22
common, trust: Avoid integer overflow
This fixes issues pointed in:
https://bugzilla.redhat.com/show_bug.cgi?id=985445
except for p11-kit/conf.c:read_config_file(), which was rewritten using
mmap() and thus length calculation is no longer needed.
common/compat.c | 8 ++++++--
common/path.c | 2 ++
common/url.c | 2 +-
trust/base64.c | 5 +++++
4 files changed, 14 insertions(+), 3 deletions(-)
commit 99c3d823fc96c47af4810a5ee091501721159a48
Author: Stanislav Brabec <sbrabec@suse.com>
Date: 2016-11-22
move privatedir from libdir to libexecdir
According to the GNU Coding Standards[1], private executables should be
installed to libexecdir, not libdir.
Move privatedir to libexecdir.
[1] https://www.gnu.org/prep/standards/
https://bugs.freedesktop.org/show_bug.cgi?id=98817
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c7d33b9fc54d618feda8960f12c71214dc9ec697
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-27
trust: Avoid confusion in DER/PEM decoding
Previously p11-kit-trust.so tried to interpret certificate as PEM format
first. This could cause potential conflict if the certificate were
actually in DER format and contained a PEM marker strings.
https://bugs.freedesktop.org/show_bug.cgi?id=92063
trust/test-token.c | 18 ++++++++++
trust/test-trust.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 2 +-
3 files changed, 115 insertions(+), 1 deletion(-)
commit 2b86585f1b1d140b73b693c81aac8b4a9af1cb8d
Author: Stef Walter <stefw@redhat.com>
Date: 2016-11-29
doc: Update documentation to point towards GitHub
The p11-kit code has moved to GitHub. The documentation needs
an update.
HACKING | 5 ++++-
doc/manual/p11-kit-devel.xml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
commit 8046370a9d0c8333d84a1294c302d21634729cc8
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: 2016-11-28
test-conf: don't create the setuid copy in /tmp
The temporary directory is often mounted with nosuid, thus whatever runs
from there doesn't get AT_SECURE in auxv.
common/test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9cb55d7357db929960dca26b9f22f488b756bac2
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-27
trust: Clarify the error message of 'extract'
https://bugzilla.redhat.com/show_bug.cgi?id=1154693
trust/extract.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit d6d0dfd10e360fdcb974e74abe92bb0910bdf172
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-23
trust: Mention anchor --remove option in help
https://bugzilla.redhat.com/show_bug.cgi?id=1158467
trust/anchor.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 1d2276dc20153eb513d67aeb3464cf0c1edf6d38
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-22
trust: Reject invalid UTF-8 input
Merge changes from utf8.c in FreeBSD's libc:
https://svnweb.freebsd.org/base/head/lib/libc/locale/utf8.c?revision=290494&view=markup#l196
https://bugzilla.redhat.com/show_bug.cgi?id=985449
trust/test-utf8.c | 2 ++
trust/utf8.c | 6 ++++++
2 files changed, 8 insertions(+)
commit 3846526ee94f6b4bbc0ea07d9d3cb72ed9f92707
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-22
pkg-config: Expose p11_trust_paths variable
The variable is mentioned in the manual but wasn't exposed from the
pkg-config.
p11-kit/p11-kit-1.pc.in | 1 +
1 file changed, 1 insertion(+)
commit c32a16ce821cf37307e53139027c5939c0b1925b
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-22
build: Remove *.in files from EXTRA_DIST
The files created with AC_CONFIG_FILES are automatically added to the
distribution.
p11-kit/Makefile.am | 2 --
1 file changed, 2 deletions(-)
commit 4965a8b2f150ea6c8dadd7dd22aab718f2814591
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-10-21
build: Don't update po files on every make run
Update po/Makevars to the latest template and take advantage of
PO_DEPENDS_ON_POT = no.
po/Makevars | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
commit de5f2e5c59a8811aaea0c19a4a8899e370413851
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-10-31
travis: Enable GCC sanitizers
.travis.yml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 09f584cbef43cac2a071b54f0fc97dd318fe88ea
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-10-31
travis: Disable silent rules
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b6305c66bfb607f49c99f820e7123c753364e894
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-21
test: Remove /proxy/deinit-after-fork test
This test hasn't been working since the removal of the pthread_atfork()
deinit code. To properly clean up, the child process needs to call
C_Initialize() and C_Finalize(), and it is already tested by
/proxy/initialize-child.
p11-kit/test-proxy.c | 37 -------------------------------------
1 file changed, 37 deletions(-)
commit bc6469c4fd576c698bab9c8b620de00d7ba1fe1a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-20
test: Fix memleak in test-token cleanup
GCC's asan spotted this:
Direct leak of 338 byte(s) in 13 object(s) allocated from:
#0 0x7f54f03fee20 in malloc (/lib64/libasan.so.3+0xc6e20)
#1 0x445e8c in p11_path_build ../common/path.c:222
#2 0x4385bd in expand_tempdir ../common/test.c:334
#3 0x43869c in p11_test_directory ../common/test.c:361
#4 0x4033e3 in setup_temp ../trust/test-token.c:79
trust/test-token.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ecaf79c6a0b35e55b27f465c6d6628f165874b78
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-22
modules: Reset the init count on fork()
Reset mod->init_count when forkid has changed. Otherwise C_Finalize
does not get called.
GCC's asan spotted this:
Direct leak of 48 byte(s) in 1 object(s) allocated from:
#0 0x7f89bc7bfe20 in malloc (/lib64/libasan.so.3+0xc6e20)
#1 0x7f89bc47a1f1 in p11_dict_new ../common/dict.c:278
#2 0x7f89bc42143d in managed_C_Initialize ../p11-kit/modules.c:1477
#3 0x7f89bc464c72 in binding_C_Initialize ../p11-kit/virtual.c:121
#4 0x7f89bc1b0a51 in ffi_closure_unix64_inner (/lib64/libffi.so.6+0x5a51)
#5 0x7f89bc1b0dbf in ffi_closure_unix64 (/lib64/libffi.so.6+0x5dbf)
#6 0x7f89bc44f9e8 in rpc_C_Initialize ../p11-kit/rpc-server.c:691
p11-kit/modules.c | 4 ++++
1 file changed, 4 insertions(+)
commit ae0527969dbb2dea5bf97257c92a65b72ba71db5
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-21
modules: Fix memleak when loading remote module
Make sure to call p11_virtual_uninit() on managed module. Otherwise the
associated lower_module will not be released.
GCC's asan spotted this:
Direct leak of 56 byte(s) in 1 object(s) allocated from:
#0 0x7f6c5368dfe0 in calloc (/lib64/libasan.so.3+0xc6fe0)
#1 0x4436ba in p11_rpc_client_init ../p11-kit/rpc-client.c:2082
#2 0x42c147 in p11_rpc_transport_new ../p11-kit/rpc-transport.c:850
#3 0x415d95 in setup_module_for_remote_inlock ../p11-kit/modules.c:411
p11-kit/modules.c | 2 ++
1 file changed, 2 insertions(+)
commit 7e94bcac88e16c22b8258bcdcb4b2165b198679a
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-21
rpc: Fix memleak in rpc_socket cleanup
GCC's asan spotted this:
Direct leak of 120 byte(s) in 1 object(s) allocated from:
#0 0x7f8d4f221fe0 in calloc (/lib64/libasan.so.3+0xc6fe0)
#1 0x427f55 in rpc_socket_new ../p11-kit/rpc-transport.c:100
#2 0x42bc1b in rpc_exec_connect ../p11-kit/rpc-transport.c:767
p11-kit/rpc-transport.c | 1 +
1 file changed, 1 insertion(+)
commit 07cadc6fd3716f1b2a8265c40b59426847042967
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-23
uri: Port to PKCS#11 GNU calling convention
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/uri.h | 2 ++
1 file changed, 2 insertions(+)
commit c30353ec1869024de672731236d9a4acd2f7dd28
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-20
uri: Fix buffer overflow in memcmp()
The commit 63644dc introduced several memcmp() calls without checking
the length of the first argument.
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/uri.c | 57 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 25 deletions(-)
commit dd514f46c880c508f69412850286d70ec8967758
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-10-06
travis: Enable build on the CI
.travis.yml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
commit a96f354c3068edb6c8ac80ae6d9a6611651145d7
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-19
rpc: Send x-init-reserved to remote module
Signed-off-by: Stef Walter <stefw@redhat.com>
* Fixed up indentation
https://bugs.freedesktop.org/show_bug.cgi?id=80519
p11-kit/Makefile.am | 7 ++++-
p11-kit/mock-module-ep3.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/modules.c | 30 ++++++++++++---------
p11-kit/rpc-client.c | 16 ++++++++++-
p11-kit/rpc-message.h | 2 +-
p11-kit/rpc-server.c | 13 +++++++++
p11-kit/test-transport.c | 24 +++++++++++++++++
7 files changed, 144 insertions(+), 16 deletions(-)
commit 2fe688e8bd360ce2f364bfb6ef80e07712c9bb86
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-09-20
test: Fix p11_virtual_init() usage
p11_virtual_init() should take a CK_FUNCTION_LIST as the 3rd argument,
if the 2nd argument is &p11_virtual_base.
https://bugs.freedesktop.org/show_bug.cgi?id=87192
p11-kit/test-virtual.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6923e8fb56692b20d24398d4746d2399490acdc1
Author: Leonardo Brondani Schenkel <leonardo.schenkel@gmail.com>
Date: 2016-10-03
Fix link of p11-kit-proxy.dylib on Mac OS X
However, on Mac OS X the library is named libp11-kit.dylib so
in the above command the source of the link resolves to nothing,
the destination becomes the source and the link to a non-existent
file is created in the working directory.
https://bugs.freedesktop.org/show_bug.cgi?id=98022
p11-kit/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d74e29cf9733a405a0ea254a2d1edf236ae8735e
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-12
test: Make test-module work --without-trust-module
The test-module program currently depends on TRUST_PATHS, which is
determined by the configure script and normally points to a resource
outside of the build tree. To make the test system-independent, use
a crafted path for testing.
https://bugs.freedesktop.org/show_bug.cgi?id=89027
trust/test-module.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 927c8e98f159607acf7fa8b0f5bcf9a4d0497742
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-10
iter: Utilize 'slot-id' URI path attribute
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/iter.c | 8 +++++-
p11-kit/test-iter.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 1 deletion(-)
commit e0c5d429df6ebe2cb88425edf42f65bfb33f0b77
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-10
iter: Utilize slot info URI path attributes
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/iter.c | 27 ++++++++++++++
p11-kit/iter.h | 2 +
p11-kit/test-iter.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+)
commit 31fbc32c41518b93a7b9903d7840378bab55370c
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-08
uri: Support 'slot-id' path attribute
Accept 'slot-id' path attribute defined in RFC 7512.
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/test-uri.c | 47 ++++++++++++++++++++++++++++++++
p11-kit/uri.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++---
p11-kit/uri.h | 4 +++
3 files changed, 126 insertions(+), 3 deletions(-)
commit 8577e4dc23349ae8d04708190de6d1ae469ab460
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-08
uri: Support slot info path attributes
Accept 'slot-description' and 'slot-manifacturer' path attributes
defined in RFC 7512.
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/private.h | 3 ++
p11-kit/test-uri.c | 70 +++++++++++++++++++++++++++++++++++++
p11-kit/uri.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/uri.h | 6 ++++
4 files changed, 180 insertions(+)
commit 63644dcb6ccf52508f41633945fce9c3a8e46d3d
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-08
uri: Remove whitespace early when parsing
For every path/query component, p11_kit_uri_parse() allocates a small
buffer to strip whitespace out. This patch removes any whitespace in
the URI at the entry of the function to simplify the code.
Note that RFC 7512 actually suggests to ignore whitespace at the
extracting phase rather than the parsing phase.
https://bugs.freedesktop.org/show_bug.cgi?id=97245
p11-kit/uri.c | 144 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 78 insertions(+), 66 deletions(-)
commit d8f90d300eb76e04dec2caba99f78e7f8a99b215
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-12
Fix leak when C_Initialize() is called from child
The test case added for bug 90289 (commit c73edd00) revealed that some
of the C_Initialize() implementations do not consider the case where it
is called from the parent process and then from the child process,
without calling C_Finalize() in between.
common/mock.c | 3 +++
p11-kit/modules.c | 2 ++
2 files changed, 5 insertions(+)
commit 8afd8d92771d279b38acc098c84027b2cf0dd168
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-18
configure: Remove redundant AM_GNU_GETTEXT
There is the same line a few lines below.
configure.ac | 1 -
1 file changed, 1 deletion(-)
commit 8c8c81942038e0068472dd9bab8d57c00b2acee4
Author: Daiki Ueno <dueno@redhat.com>
Date: 2016-08-12
Fix typos flagged by codespell
p11-kit/fixtures/test-system-none.conf | 2 +-
p11-kit/iter.c | 8 ++++----
p11-kit/modules.c | 4 ++--
p11-kit/rpc-server.c | 2 +-
p11-kit/util.c | 2 +-
trust/builder.c | 2 +-
trust/p11-kit-trust.module | 2 +-
trust/parser.c | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
commit fb73b3a908d8fa21b0e7f6461fc9e77c1e15f4b3
Author: Stef Walter <stefw@redhat.com>
Date: 2016-08-09
Fix typo in pkcs11.conf
Pointed out by David Woodhouse
doc/manual/pkcs11.conf.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fedcaf873e4d08741407c7be1db8c2d73dcc1241
Author: Stef Walter <stefw@redhat.com>
Date: 2016-08-09
doc: Fix interpolation of p11-kit configuration paths in documentation
Previously these were expanded based on the home directory of the
one building the documentation (me).
doc/manual/Makefile.am | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
commit 77d0791d0d6baf6fcc7578e0d170d754850c4068
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2016-02-23
Doc: p11_kit_module_load accepts a filename arg.
p11_kit_module_load() hands on the module_path argument to
load_module_from_file_inlock() which accepts relative paths, prepending
P11_MODULE_PATH. Update API documentation accordingly.
https://lists.freedesktop.org/archives/p11-glue/2016-February/000587.html
p11-kit/modules.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 6c4ef3f492d88acca931174519b7aa1215cc1a18
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2016-01-05
Avoiding redundant check
https://bugs.freedesktop.org/show_bug.cgi?id=93587
p11-kit/modules.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit 5f6cc6c4c66050069d0db93006299cde44920559
Author: Stef Walter <stefw@redhat.com>
Date: 2015-12-07
Fix distcheck by removing some linguas that don't build
po/LINGUAS | 2 --
1 file changed, 2 deletions(-)
commit 8ccd99b26d5fb2e19ec45ce3dca28bf53b73c70d
Author: Stef Walter <stefw@redhat.com>
Date: 2015-12-07
Bump version number
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit d0b59f5b155369dd2b933c359c1f81e6199e2c3f
Author: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: 2015-12-02
rpc-transport.c: include sys/select.h for fd_set
fd_set and friends, according to POSIX.1-2001, needs sys/select.h, so
include it otherwise the build fails for uClibc:
p11-kit/rpc-transport.c: In function ‘rpc_socket_read’:
p11-kit/rpc-transport.c:350:2: error: unknown type name ‘fd_set’
p11-kit/rpc-transport.c:416:4: warning: implicit declaration of function
‘FD_ZERO’ [-Wimplicit-function-declaration]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
https://bugs.freedesktop.org/show_bug.cgi?id=93211
p11-kit/rpc-transport.c | 1 +
1 file changed, 1 insertion(+)
commit 981f5358988a4c7044aeddd5bd783c28b2665410
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-11-04
p11-kit: Fix redundant check for 'signature' is always 'true'
https://bugs.freedesktop.org/show_bug.cgi?id=92807
common/mock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 957c6d8c610b71665573564f2299d9aca86d2483
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-11-06
common: Fix warning about dereferencing NULL pointer
https://bugs.freedesktop.org/show_bug.cgi?id=92842
common/mock.c | 1 +
1 file changed, 1 insertion(+)
commit 4e22ebfda7b51ec978eacf0c3653bb534de97fe3
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-11-06
common: Fix in test-code for file descriptor validity check
https://bugs.freedesktop.org/show_bug.cgi?id=92843
common/test-compat.c | 1 +
1 file changed, 1 insertion(+)
commit a512a01e4c2700a6454d024150aa222f64885d59
Author: Stef Walter <stefw@redhat.com>
Date: 2015-11-09
trust: Fix always false comparison of EAGAIN and EINTR
https://bugs.freedesktop.org/show_bug.cgi?id=92864
trust/save.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6558c7174bc6778f13347fc1a356ed6773cef830
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-21
p11-kit: Remove unused pointer
https://bugs.freedesktop.org/show_bug.cgi?id=92532
p11-kit/modules.c | 2 --
1 file changed, 2 deletions(-)
commit 478f1065fb6d92fbd4bdf8b0a513f32cf48af170
Author: Stef Walter <stefw@redhat.com>
Date: 2015-10-20
po: Update translations from transifex
build/tx-update | 6 +-
po/ar.po | 4 +-
po/as.po | 4 +-
po/az.po | 6 +-
po/bg.po | 16 ++-
po/bn_IN.po | 4 +-
po/ca.po | 4 +-
po/ca@valencia.po | 4 +-
po/cs.po | 152 ++++++++++++------------
po/cy.po | 4 +-
po/da.po | 4 +-
po/de.po | 30 ++---
po/el.po | 179 ++++++++++++++--------------
po/en_GB.po | 179 ++++++++++++++--------------
po/eo.po | 18 ++-
po/es.po | 21 ++--
po/es_CL.po | 342 ------------------------------------------------------
po/et.po | 2 +-
po/eu.po | 16 ++-
po/fa.po | 16 ++-
po/fi.po | 25 ++--
po/fo.po | 4 +-
po/fr.po | 179 ++++++++++++++--------------
po/ga.po | 4 +-
po/gl.po | 30 +++--
po/gu.po | 4 +-
po/he.po | 4 +-
po/hi.po | 4 +-
po/hr.po | 23 ++--
po/hu.po | 21 ++--
po/ia.po | 16 ++-
po/id.po | 19 ++-
po/it.po | 24 ++--
po/it_IT.po | 342 ------------------------------------------------------
po/ja.po | 19 ++-
po/ka.po | 21 ++--
po/kk.po | 17 +--
po/kn.po | 4 +-
po/ko.po | 23 ++--
po/lt.po | 4 +-
po/lv.po | 24 ++--
po/ml.po | 4 +-
po/mr.po | 4 +-
po/ms.po | 4 +-
po/nb.po | 4 +-
po/nl.po | 21 ++--
po/nn.po | 4 +-
po/oc.po | 6 +-
po/or.po | 4 +-
po/pa.po | 18 ++-
po/pl.po | 22 ++--
po/pt.po | 4 +-
po/pt_BR.po | 21 ++--
po/ro.po | 4 +-
po/ru.po | 184 ++++++++++++++---------------
po/sk.po | 180 ++++++++++++++--------------
po/sl.po | 21 ++--
po/sq.po | 16 ++-
po/sr.po | 24 ++--
po/sr@latin.po | 4 +-
po/sv.po | 171 +++++++++++++--------------
po/ta.po | 4 +-
po/te.po | 16 ++-
po/th.po | 4 +-
po/tr.po | 144 ++++++++++++-----------
po/uk.po | 21 ++--
po/vi.po | 4 +-
po/wa.po | 4 +-
po/zh_CN.po | 179 ++++++++++++++--------------
po/zh_HK.po | 16 ++-
po/zh_TW.po | 19 ++-
71 files changed, 1097 insertions(+), 1856 deletions(-)
commit 5e6336ba0393c9d69be843c432e4c4927caea245
Author: Stef Walter <stefw@redhat.com>
Date: 2015-10-20
Add estonian translation from Transifex
po/LINGUAS | 1 +
po/et.po | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 343 insertions(+)
commit 98dbc98709bb9a5fe1d6e7beea585c39073e528c
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-20
p11-kit: Fix warnings related to use dangling pointer
https://bugs.freedesktop.org/show_bug.cgi?id=92551
p11-kit/modules.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 29014eab3caf4f70fcd94c8198ca24992b1e5ec6
Author: Stef Walter <stefw@redhat.com>
Date: 2015-10-19
common: Remove compat timegm() implementation
We no longer use timegm()
common/compat.c | 31 -------------------------------
configure.ac | 1 -
2 files changed, 32 deletions(-)
commit 3be562d4d386eddc79489715507d979135d4b74a
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-19
p11-kit: 'int' comparison with 'unsigned int' in for() for the array index
https://bugs.freedesktop.org/show_bug.cgi?id=92443
common/array.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2db405ff7781ec43b77bd2592c41eff22e2b362a
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-19
p11-kit: 'int' comparison with 'unsigned int' in for() for array index
common/dict.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c57c1d592c82da7f444cde440c5f32930542b43a
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-19
p11-kit: 'int' comparison with 'unsigned int' in for() for array index
https://bugs.freedesktop.org/show_bug.cgi?id=92445
p11-kit/proxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4286fd792b869e27cc362a8de9334d4686aed539
Author: Ludovic Rousseau <ludovic.rousseau@gmail.com>
Date: 2015-10-19
manual: Fix typos in documentation
https://bugs.freedesktop.org/show_bug.cgi?id=92520
doc/manual/p11-kit-sharing.xml | 4 ++--
doc/manual/pkcs11.conf.xml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
commit ee1d48020b24164b5547de2affd0f38dafab8949
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-10-12
p11-kit: Fix expression 'call_id < 0' is always false
https://bugs.freedesktop.org/show_bug.cgi?id=92434
p11-kit/rpc-message.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3a005e75a4e1b63db8e19ea0e73479588ab345a6
Author: Robert Milasan <rmilasan@suse.com>
Date: 2015-07-30
Fix trust command segfaults in expand_homedir() when no matching password record was found
Hello, it looks like under some conditions, command trust segfaults in
expand_homedir() due to no matching password record was found:
Signed-off-by: Robert Milasan <rmilasan@suse.com>
Signed-off-by: Stef Walter <stefw@redhat.com>
* Updated path so message is printed and errno is not overwritten
https://bugs.freedesktop.org/show_bug.cgi?id=91506
common/path.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
commit ac151af6e41242eb46689f326311195b5f7b65fc
Author: Lew Palm <l.palm@m-privacy.de>
Date: 2015-07-14
Fix build on Mingw due to missing EWOULDBLOCK
https://bugs.freedesktop.org/show_bug.cgi?id=89081
p11-kit/rpc-transport.c | 3 +++
1 file changed, 3 insertions(+)
commit 406803044f61fcbd491749a5530b39beed270dd2
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2015-07-10
Added p11_kit_module_get_filename()
That function allows to obtain the filename used by the PKCS #11
module. That is the filename used by dlopen().
Note that we don't provide p11_kit_module_for_filename() because
it would have to deal with filename equivalences.
Signed-off-by: Stef Walter <stefw@redhat.com>
* Fixed up whitespace
p11-kit/modules.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/p11-kit.h | 1 +
p11-kit/test-modules.c | 40 +++++++++++++++++++++++++++++++++++++++-
3 files changed, 85 insertions(+), 1 deletion(-)
commit cacaf8cd0b0a4f2cd61b61b012cd5cbf715fe38f
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2015-06-24
In proxy module don't call C_Finalize on a forked process.
This corrects a deadlock on the forked process. The deadlock
happened because the proxy called C_Finalize prior to a C_Initialize
which is wrong according to PKCS #11 (2.40). This patch eliminates
the C_Finalize call in that case.
This resolves #90289
https://bugs.freedesktop.org/show_bug.cgi?id=90289
Reviewed-by: Stef Walter <stefw@redhat.com>
p11-kit/proxy.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
commit c73edd002462ca1185de1e9e72d9f68f01c93f32
Author: David Woodhouse <David.Woodhouse@intel.com>
Date: 2015-06-03
Add test case for bug 90289 (deadlock on C_Initialize() in child after fork)
Reviewed-by: Stef Walter <stefw@redhat.com>
p11-kit/test-proxy.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
commit ec8a291efb87f1751a18c7e023a67232c15a4ef2
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2015-06-24
Do not deinitialize libffi's wrapper functions
Libffi uses shared memory to store them, and a deallocation
in a child will cause issues for the parent or vice versa.
Signed-off-by: Stef Walter <stefw@redhat.com>
* Use #if to comment out code, avoid compiler warnings
p11-kit/virtual.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit c9095cb154cfd9937332b1a980316d10a9655d51
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2015-06-23
Added test case for crash after a fork in proxy module
Reviewed-by: Stef Walter <stefw@redhat.com>
p11-kit/test-proxy.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 45 insertions(+), 1 deletion(-)
commit c562aff333bd73a3fe5c15d2969a4ea70300a426
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-06-03
p11-kit: Missing unlock in function rpc_socket_read()
https://bugs.freedesktop.org/show_bug.cgi?id=90827
p11-kit/rpc-transport.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 8768b4611d3268d6fca7fc214ce0a5c7ec7fc332
Author: Pankaj <pankaj.s01@samsung.com>
Date: 2015-06-01
trust: Fix double close()
trust/save.c | 1 -
1 file changed, 1 deletion(-)
commit 6712b49861e3e59534c5e4b6d75146a01b939aff
Author: Stef Walter <stefw@redhat.com>
Date: 2015-04-17
Fix some compiler warnings from GCC 5.x
trust/test-persist.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit ec9e2450bafa1cda47525b38a28c8f981f43c1e1
Author: Stef Walter <stefw@redhat.com>
Date: 2015-02-20
Release version 0.23.1
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit e49fba71493408305b297df7eb4e64d882b778ee
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: 2014-12-23
Generate URIs compliant to the PKCS#11 URI draft in LC
We continue to accept both the older style 'object-type' field
in addition to the new 'type' field. However we start generating
URIs in the new form.
In other words we have backwards compatibility, but not forwards
compatibility. Given the fact that PKCS#11 URIs are now standardizing
this is an acceptable compromise.
https://bugs.freedesktop.org/show_bug.cgi?id=86474
p11-kit/test-uri.c | 26 +++++++++++++-------------
p11-kit/uri.c | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
commit 6fb74150b8c8f957e96fd423beeccd36cf04e1bc
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: 2014-12-23
Added test for pin-value
https://bugs.freedesktop.org/show_bug.cgi?id=87582
Signed-off-by: Stef Walter <stefw@redhat.com>
* Added test for bad encoded pin-value in uri
p11-kit/test-uri.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
commit d1122aa7587c445b3d03f35258ea46038807bf69
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: 2014-12-23
Added support for pin-value PKCS#11 URI element
https://bugs.freedesktop.org/show_bug.cgi?id=87582
p11-kit/uri.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/uri.h | 5 +++++
2 files changed, 57 insertions(+)
commit 890d69d7fde23ea15a082026a4d1c01aba805569
Author: Stef Walter <stefw@redhat.com>
Date: 2015-02-20
p11-kit: Remove duplicate WHITESPACE define
p11-kit/uri.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
commit a6df1f21e42a3b57448eb6897b976ac8883908eb
Author: Adam Williamson <awilliam@redhat.com>
Date: 2015-01-13
trust: Add pem-directory-hash extract format
This allows extraction of a directory of standard PEM files
with the OpenSSL hash symlinks; this is a format used by
some popular platforms (Debian's /etc/ssl/certs is in this
form, and OpenSUSE provides it for compatibility).
Initially by: Ludwig Nussel <ludwig.nussel@suse.de>
Signed-off-by: Stef Walter <stefw@redhat.com>
* Added header, fixed compiler warnings
doc/manual/trust.xml | 6 +++-
trust/extract-openssl.c | 76 ++++++++++++++++++++++++++-----------------------
trust/extract-pem.c | 49 +++++++++++++++++++++++++------
trust/extract.c | 17 ++++++-----
trust/extract.h | 8 ++++++
trust/test-bundle.c | 35 +++++++++++++++++++++++
6 files changed, 139 insertions(+), 52 deletions(-)
commit b65e3148a8ea2d54b17a8be617bbdcb026c49fcd
Author: Stef Walter <stefw@redhat.com>
Date: 2014-11-14
uri: Accept 'type' in additon to 'object-type' in PKCS#11 URIs
This was a later change to the PKCS#11 specification drafts
p11-kit/test-uri.c | 27 +++++++++++++++++++++++++++
p11-kit/uri.c | 5 +++--
2 files changed, 30 insertions(+), 2 deletions(-)
commit 7c2270eaaaf0e60e204cb81dd017bc89394f4f59
Author: Michael Cronenworth <mcronenworth@pdxinc.com>
Date: 2014-11-11
compat: Add definition for setenv for Win32
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
common/compat.h | 4 ++++
configure.ac | 1 +
2 files changed, 5 insertions(+)
commit bfb3bd47aa48983f5349479bca598403097ff81c
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-09
Release version 0.22.1
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 03d280df9a73aca5cb6eabbcb97ef3ca4e1ae0e5
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-09
trust: Certificate CKA_ID is SubjectKeyIdentifier if possible
The PKCS#11 spec states that the CKA_ID should match the
SubjectKeyIdentifier if such an extension is present.
We delay the filling of CKA_ID until the builder phase of populating
attributes which allows us to have more control over how this works.
Note that we don't make CKA_ID reflect SubjectKeyIdentifier *attached*
extensions. The CKA_ID isn't supposed to change after object creation.
Making it dependent on attached extensions would be making promises
we cannot keep, since attached extensions can be added/removed at any
time.
This also means the CKA_ID of attached extensions and certificates
won't necessarily match up, but that was never promised, and not how
attached extensions should be matched to their certificate anyway.
Based on a patch and research done by David Woodhouse.
https://bugs.freedesktop.org/show_bug.cgi?id=84761
trust/builder.c | 55 ++++++++++++++++++++++++++++++++++++++++++----------
trust/parser.c | 37 ++++++++++-------------------------
trust/test-builder.c | 2 +-
trust/test-parser.c | 2 --
trust/test-trust.c | 2 ++
trust/x509.c | 32 +++++++++++++++++++++++++-----
trust/x509.h | 7 ++++++-
7 files changed, 91 insertions(+), 46 deletions(-)
commit b3579cb54bd5cd16e9740404408b2505b4b1e26b
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-12
trust: Allow 'BEGIN PUBLIC KEY' PEM blocks in .p11-kit files
These PEM blocks contribute a CKA_PUBLIC_KEY_INFO to the object
being read/written.
https://bugs.freedesktop.org/show_bug.cgi?id=83799
doc/internal/persist-format.txt | 13 +++++++++----
trust/persist.c | 24 ++++++++++++++++++++++++
trust/test-persist.c | 27 +++++++++++++++++++++++++++
trust/test-trust.h | 22 ++++++++++++++++++++++
4 files changed, 82 insertions(+), 4 deletions(-)
commit c1dd399d265f20bd3df4dc76dcf735aba1ffa515
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2014-10-06
trust: add missing libtasn1 cflags
Add a number of missing LIBTASN1_CFLAGS where it's required
trust/Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
commit af8fba2fa90c6d9b98750f7e33c3b0df9f698cfc
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-06
Bump libtool versioning for added APIs
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ab778cc54c8671ba79cf4baca7be2608c7cce886
Author: Antoine Jacoutot <ajacoutot@gnome.org>
Date: 2014-10-05
Unbreak build on OpenBSD
Add missing header for strdup(3).
When EPROTO is not available, fallback to EIO.
https://bugs.freedesktop.org/show_bug.cgi?id=84665
p11-kit/rpc-transport.c | 5 +++++
1 file changed, 5 insertions(+)
commit 80e4f6a6e04582fe11c98e6133e3e306e5556d8d
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2014-10-04
makefile: Rename DATADIR to not conflict with Win32 define
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
Makefile.am | 2 +-
trust/module.c | 2 +-
trust/test-module.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit b785f39384af08c35b08ab74671443234260cccc
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-02
Release version 0.22.0
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 16e25b2890927108ec15297aabb1d86a49792741
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-03
p11-kit: Use pthread_atfork() in a safe manner
Instead of trying to perform actions in pthread_atfork() which
are not async-signal-safe, just increment a counter so we can
later tell if the process has forked.
Note this does not make it safe to mix threads and forking without
immediately execing. This is a far broader problem that p11-kit,
however we now do the right thing when fork+exec is used from a
thread.
https://bugs.freedesktop.org/show_bug.cgi?id=84567
common/library.c | 11 ++++++++++
common/library.h | 2 ++
common/mock.c | 1 +
p11-kit/modules.c | 55 ++++++++++------------------------------------
p11-kit/proxy.c | 62 ++++++++++++++++------------------------------------
p11-kit/proxy.h | 2 --
p11-kit/rpc-client.c | 20 ++++++++---------
p11-kit/test-proxy.c | 2 +-
p11-kit/test-rpc.c | 25 +++++++--------------
9 files changed, 63 insertions(+), 117 deletions(-)
commit a3b1e1c2f2c8c1f14293d8158b6dfeb2a6560908
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-01
remote: Run separate executable binary for 'p11-kit remote'
This allows security frameworks like SELinux or AppArmor to target
it specifically.
Makefile.am | 1 +
p11-kit/Makefile.am | 13 ++++-
p11-kit/p11-kit.c | 69 +-------------------------
p11-kit/remote.c | 137 ++++++++++++++++++---------------------------------
p11-kit/rpc-server.c | 101 +++++++++++++++++++++++++++++++++++++
5 files changed, 164 insertions(+), 157 deletions(-)
commit 76f230ced6e9ca2a598988bc00b7b971208e8f64
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-02
p11-kit: P11_KIT_PRIVATEDIR env var overrides private binary dir
External binaries are searched for in $(libdir)/p11-kit. The
P11_KIT_PRIVATEDIR can be used to override that, for example during
'make check'
p11-kit/p11-kit.c | 7 ++++++-
p11-kit/test-transport.c | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
commit 960cb9a7db1950ad1414f70b0e3ec240542601ac
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-02
common: Use secure_getenv() implementation when setuid
In anything security sensitive, use secure_getenv() implementation
for retrieving environment variables.
common/Makefile.am | 8 ++++++-
common/compat.c | 8 +++++++
common/compat.h | 2 ++
common/debug.c | 3 ++-
common/frob-getenv.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
common/test-compat.c | 27 ++++++++++++++++++++++
common/test.c | 2 +-
configure.ac | 2 +-
8 files changed, 113 insertions(+), 4 deletions(-)
commit c9474683dd3db5ad87227dd3c3734ab31bfc01e9
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-02
common: In tests preserve parent environment for children
common/test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d3505c2b556b859e1a14062579fd67ec2ab25435
Author: Stef Walter <stefw@redhat.com>
Date: 2014-10-01
p11-kit: Remove the 'isolated' option for now
This option was not completed in time, and as implemented suffers
from limitations that the module is not really completely isolated
as it still runs under the same user id as the calling process.
doc/manual/p11-kit-sharing.xml | 5 +++--
doc/manual/pkcs11.conf.xml | 11 ++---------
p11-kit/modules.c | 13 -------------
3 files changed, 5 insertions(+), 24 deletions(-)
commit c41e0e1d9a4a9a4533bc6f370e5eebe1d6b9752c
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2014-09-12
common: Move unistd include to define getopt and friends
Needed to fix MinGW builds.
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
common/test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit eeca6f88e1c59543b09df3f9a45224e32d531ef7
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-17
Release version 2.21.3
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 800f310dd3f2fcbf3852a42c67b5dd37e4ef4415
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-10
trust: Use term 'attached extensions' instead of 'stapled'
The term 'stapled extensions' is confusing because it overloads
terminology used with OSCP stapling.
Suggested by Daniel Kahn Gillmor.
trust/builder.c | 4 ++--
trust/enumerate.c | 48 ++++++++++++++++++++++++------------------------
trust/enumerate.h | 2 +-
trust/extract-openssl.c | 8 ++++----
trust/parser.c | 46 +++++++++++++++++++++++-----------------------
trust/test-builder.c | 30 +++++++++++++++---------------
trust/test-enumerate.c | 2 +-
trust/test-parser.c | 4 ++--
8 files changed, 72 insertions(+), 72 deletions(-)
commit eccbcc298f59eb9518b07baf840930cec54c7655
Author: Stef Walter <stefw@redhat.com>
Date: 2014-09-04
common: New public pkcs11x.h header containing extensions
Move our internal stuff to pkcs11i.h, and install the pkcs11x.h
header containing extensions.
https://bugs.freedesktop.org/show_bug.cgi?id=83495
common/Makefile.am | 3 +-
common/attrs.c | 1 +
common/constants.c | 1 +
common/mock.h | 2 +-
common/pkcs11i.h | 505 +++++++++++++++++++++++++++++++++++++++++++++++++
common/pkcs11x.h | 458 +-------------------------------------------
doc/manual/Makefile.am | 1 +
p11-kit/virtual.h | 2 +-
trust/builder.c | 1 +
trust/persist.c | 1 +
trust/test-builder.c | 1 +
trust/test-persist.c | 1 +
12 files changed, 520 insertions(+), 457 deletions(-)
commit b1cd802e4241aa81c12ba4ecccdb17404799ff03
Author: Stef Walter <stefw@redhat.com>
Date: 2014-09-04
common: Change the CKA_X_PUBLIC_KEY_INFO constant to CKA_PUBLIC_KEY_INFO
CKA_PUBLIC_KEY_INFO is defined in the PKCS#11 2.40 draft, so use that
rather than defining our own.
* Fixed up by Nikos Mavrogiannopoulos <nmav@redhat.com>
https://bugs.freedesktop.org/show_bug.cgi?id=83495
common/attrs.c | 2 +-
common/constants.c | 2 +-
common/pkcs11x.h | 6 +++++-
trust/builder.c | 14 +++++++-------
trust/enumerate.c | 16 ++++++++--------
trust/list.c | 2 +-
trust/parser.c | 2 +-
trust/test-builder.c | 28 ++++++++++++++--------------
trust/test-enumerate.c | 8 ++++----
trust/test-openssl.c | 12 ++++++------
trust/test-parser.c | 8 ++++----
11 files changed, 52 insertions(+), 48 deletions(-)
commit 9ba2165ef75c63960ce95c9b1b085a0a630cfb14
Author: Stef Walter <stefw@redhat.com>
Date: 2014-09-04
common: Add support for multiple field names (ie: nicks) per constant
This allows us to have old/new names for a given constant.
https://bugs.freedesktop.org/show_bug.cgi?id=83495
common/constants.c | 31 ++++++++++++++++---------------
common/constants.h | 2 +-
common/test-constants.c | 10 +++++-----
3 files changed, 22 insertions(+), 21 deletions(-)
commit 1ede9a957c5a4f2c44b6bc88ba380a41c145a81b
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2014-09-09
p11-kit: Fix tests when building with MinGW
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
p11-kit/test-managed.c | 9 +++++++++
p11-kit/test-rpc.c | 9 +++++++++
p11-kit/test-transport.c | 12 ++++++++++++
3 files changed, 30 insertions(+)
commit 086c08ceef86825b7b738c2da016915e91896a20
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2014-08-17
trust: Fix token test when building with MinGW
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
trust/test-token.c | 4 ++++
1 file changed, 4 insertions(+)
commit 92ad58dec9a170a128734ea99e532e8a6a7d5499
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2014-09-09
configure: Check for pthread_create() in pthread library
Check for pthread_create() in pthread library instaed of
pthread_mutexattr_init(). This fixes a linking error on FreeBSD.
https://bugs.freedesktop.org/show_bug.cgi?id=75674
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 4dd71231c7b425c44ca231c6c7b1df97545d1501
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-09
p11-kit: Compilation fixes for previous commit
Pushed the wrong version
p11-kit/proxy.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit 50e4702e6c94aeb3c9096661a78f59db96c86226
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-09
p11-kit: Make proxy module respect critical = no
The p11-kit-proxy.so module would not respect the critical = no setting
in module configuration, and fail if any module failed to initialize.
https://bugs.freedesktop.org/show_bug.cgi?id=83651
p11-kit/proxy.c | 84 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 37 deletions(-)
commit aff7ac7ef469f96a55063ba423af66fca17c29c7
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2014-08-18
Fix build without debug
When building without debug build fails with:
CCLD p11-kit/p11-kit
./.libs/libp11-kit.so: undefined reference to `P11_RPC_CHECK_CALLS'
cc: error: linker command failed with exit code 1 (use -v to see
invocation)
gmake[2]: *** [p11-kit/p11-kit] Error 1
This happens because P11_RPC_CHECK_CALLS is not defined when
debugging is enabled, so provide a noop macro for that case.
p11-kit/rpc-message.h | 2 ++
1 file changed, 2 insertions(+)
commit c3fc7b49890bef7c28c1315476c6270d8ed1a492
Author: Stef Walter <stef@thewalter.net>
Date: 2014-09-05
trust: Show public-key-info in 'trust list --details'
Since the public-key-info is an important part of the way we
represent trust, show it in 'trust list' if --details is present.
trust/list.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
commit d715fe5312f7b7c1b881cc49847cc15347e286fc
Author: Stef Walter <stefw@redhat.com>
Date: 2014-09-05
Release version 0.21.2
NEWS | 10 ++++++++++
configure.ac | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
commit dc55d9d5fc5d904f0bc3c06ba3caf64483b18fa9
Author: Stef Walter <stefw@redhat.com>
Date: 2014-09-05
trust: Produce a proper message for an invalid stapled extension
Previously we would output a line like this:
p11-kit: 'node != NULL' not true at lookup_extension
trust/builder.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
commit 677dee1a04058aefe8c7689f88da52afe3b4b4bb
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-15
Move to non-recursive Makefile for building bins and libs
Still use recursive for documentation and translation.
Makefile.am | 66 +++--
build/Makefile.decl | 16 --
build/Makefile.tests | 21 --
build/certs/Makefile | 38 +--
common/Makefile.am | 113 ++++++---
common/{tests => }/frob-getauxval.c | 0
common/{tests => }/test-array.c | 0
common/{tests => }/test-attrs.c | 0
common/{tests => }/test-buffer.c | 0
common/{tests => }/test-compat.c | 0
common/{tests => }/test-constants.c | 0
common/{tests => }/test-dict.c | 0
common/{tests => }/test-hash.c | 0
common/{tests => }/test-lexer.c | 0
common/{tests => }/test-message.c | 0
common/{tests => }/test-path.c | 0
common/{tests => }/test-tests.c | 0
common/{tests => }/test-url.c | 0
common/tests/Makefile.am | 39 ---
configure.ac | 8 +-
doc/manual/Makefile.am | 8 +-
p11-kit/Makefile.am | 244 ++++++++++++------
.../files => fixtures}/package-modules/four.module | 0
.../package-modules/win32/four.module | 0
.../files => fixtures}/system-modules/one.module | 0
.../system-modules/two-duplicate.module | 0
.../files => fixtures}/system-modules/two.badname | 0
.../system-modules/win32/one.module | 0
.../system-modules/win32/two-duplicate.module | 0
.../system-modules/win32/two.badname | 0
.../{tests/files => fixtures}/system-pkcs11.conf | 0
p11-kit/{tests/files => fixtures}/test-1.conf | 0
p11-kit/{tests/files => fixtures}/test-pinfile | 0
.../{tests/files => fixtures}/test-pinfile-large | 0
.../files => fixtures}/test-system-invalid.conf | 0
.../files => fixtures}/test-system-merge.conf | 0
.../files => fixtures}/test-system-none.conf | 0
.../files => fixtures}/test-system-only.conf | 0
.../files => fixtures}/test-user-invalid.conf | 0
.../{tests/files => fixtures}/test-user-only.conf | 0
p11-kit/{tests/files => fixtures}/test-user.conf | 0
.../files => fixtures}/user-modules/one.module | 0
.../files => fixtures}/user-modules/three.module | 0
.../user-modules/win32/one.module | 0
.../user-modules/win32/three.module | 0
p11-kit/{tests => }/frob-setuid.c | 0
p11-kit/{tests => }/mock-module-ep.c | 0
p11-kit/{tests => }/mock-module-ep2.c | 0
p11-kit/{tests => }/print-messages.c | 0
p11-kit/{tests => }/test-conf.c | 54 ++--
p11-kit/{tests => }/test-deprecated.c | 0
p11-kit/{tests => }/test-init.c | 0
p11-kit/{tests => }/test-iter.c | 0
p11-kit/{tests => }/test-log.c | 0
p11-kit/{tests => }/test-managed.c | 0
p11-kit/{tests => }/test-mock.c | 0
p11-kit/{tests => }/test-modules.c | 0
p11-kit/{tests => }/test-pin.c | 6 +-
p11-kit/{tests => }/test-progname.c | 0
p11-kit/{tests => }/test-proxy.c | 0
p11-kit/{tests => }/test-rpc.c | 0
p11-kit/{tests => }/test-transport.c | 2 +-
p11-kit/{tests => }/test-uri.c | 0
p11-kit/{tests => }/test-util.c | 0
p11-kit/{tests => }/test-virtual.c | 0
p11-kit/tests/Makefile.am | 91 -------
trust/Makefile.am | 273 +++++++++++++++------
trust/anchor.c | 5 +-
trust/enumerate.h | 5 +-
trust/extract.c | 5 +-
trust/{tests/files => fixtures}/cacert-ca.der | Bin
.../files => fixtures}/cacert3-distrust-all.pem | 0
.../files => fixtures}/cacert3-distrusted-all.pem | 0
.../files => fixtures}/cacert3-not-trusted.pem | 0
.../files => fixtures}/cacert3-trusted-alias.pem | 0
.../files => fixtures}/cacert3-trusted-keyid.pem | 0
.../cacert3-trusted-server-alias.pem | 0
.../{tests/files => fixtures}/cacert3-trusted.pem | 0
trust/{tests/files => fixtures}/cacert3-twice.pem | 0
trust/{tests/files => fixtures}/cacert3.der | Bin
trust/{tests/files => fixtures}/cacert3.pem | 0
trust/{tests/files => fixtures}/distrusted.pem | 0
trust/{tests/files => fixtures}/empty-file | 0
trust/{tests/files => fixtures}/multiple.pem | 0
.../files => fixtures}/openssl-trust-no-trust.pem | 0
trust/{tests/files => fixtures}/redhat-ca.der | Bin
.../files => fixtures}/self-signed-with-eku.der | Bin
.../files => fixtures}/self-signed-with-ku.der | Bin
trust/{tests/files => fixtures}/simple-string | 0
trust/{tests/files => fixtures}/testing-server.der | Bin
trust/{tests/files => fixtures}/thawte.pem | 0
.../files => fixtures}/unrecognized-file.txt | 0
trust/{tests/files => fixtures}/verisign-v1.der | Bin
trust/{tests/files => fixtures}/verisign-v1.pem | 0
trust/{tests => }/frob-bc.c | 0
trust/{tests => }/frob-cert.c | 0
trust/{tests => }/frob-eku.c | 0
trust/{tests => }/frob-ext.c | 0
trust/{tests => }/frob-ku.c | 0
trust/{tests => }/frob-multi-init.c | 0
trust/{tests => }/frob-nss-trust.c | 0
trust/{tests => }/frob-oid.c | 0
trust/{tests => }/frob-pow.c | 0
trust/{tests => }/frob-token.c | 0
trust/{tests => }/input/anchors/cacert3.der | Bin
trust/{tests => }/input/anchors/testing-ca.der | Bin
trust/{tests => }/input/blacklist/self-server.der | Bin
trust/{tests => }/input/cacert-ca.der | Bin
trust/{tests => }/input/distrusted.pem | 0
trust/{tests => }/input/verisign-v1.p11-kit | 0
trust/list.c | 5 +-
trust/{tests => }/test-asn1.c | 0
trust/{tests => }/test-base64.c | 0
trust/{tests => }/test-builder.c | 0
trust/{tests => }/test-bundle.c | 12 +-
trust/{tests => }/test-cer.c | 12 +-
trust/{tests => }/test-digest.c | 0
trust/{tests => }/test-enumerate.c | 2 +
trust/{tests => }/test-extract.in | 0
trust/{tests => }/test-index.c | 0
trust/{tests => }/test-module.c | 16 +-
trust/{tests => }/test-oid.c | 0
trust/{tests => }/test-openssl.c | 20 +-
trust/{tests => }/test-parser.c | 20 +-
trust/{tests => }/test-pem.c | 0
trust/{tests => }/test-persist.c | 0
trust/{tests => }/test-save.c | 14 +-
trust/{tests => }/test-token.c | 4 +-
trust/{tests => }/test-trust.c | 0
trust/{tests => }/test-trust.h | 0
trust/{tests => }/test-utf8.c | 0
trust/{tests => }/test-x509.c | 0
trust/tests/Makefile.am | 122 ---------
133 files changed, 632 insertions(+), 589 deletions(-)
commit 2a35a67923c26cd38839197aee51c274e5c2550e
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-15
common: Fix regression introduced by last commit
The last commit caused dirfd() to become undefined.
https://bugs.freedesktop.org/show_bug.cgi?id=82617
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bf8dfa9f33c1aa8d76f8d1ae6cf79afb90497cd4
Author: Baruch Siach <baruch@tkos.co.il>
Date: 2014-05-05
Fix build against older pthreads implementations
Older pthreads implementations like glibc NPTL prior to version 2.12, and
uClibc linuxthreads (both), need _XOPEN_SOURCE to expose
pthread_mutexattr_settype() and THREAD_MUTEX_DEFAULT. The value 600 (SuSv3,
POSIX.1-2001) is equivalent to _POSIX_C_SOURCE 200112L.
Fixes the following build error:
CC compat.lo
compat.c: In function 'p11_mutex_init':
compat.c:164:2: warning: implicit declaration of function 'pthread_mutexattr_settype' [-Wimplicit-function-declaration]
compat.c:164:2: warning: nested extern declaration of 'pthread_mutexattr_settype' [-Wnested-externs]
compat.c:164:36: error: 'PTHREAD_MUTEX_DEFAULT' undeclared (first use in this function)
https://bugs.freedesktop.org/show_bug.cgi?id=82617
common/compat.c | 6 ++++++
1 file changed, 6 insertions(+)
commit ea10b26125eff14d5b138ceb0e55994bd38f7381
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-14
Fix 'make upload-release' target
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6333aedd27b1a9cb81ac2d0556c1a97f726bdb33
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-11
doc: Fix missing tag in p11-kit-sharing.xml
doc/manual/p11-kit-sharing.xml | 1 +
1 file changed, 1 insertion(+)
commit ea39cf40a881fd28f86e2625dff80fde58f2e08a
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-11
p11-kit: Fix various noise/issues highlighted by clang
p11-kit/modules.c | 1 -
p11-kit/remote.c | 3 +--
p11-kit/rpc-client.c | 4 ++--
p11-kit/rpc-server.c | 18 ++++++++++--------
4 files changed, 13 insertions(+), 13 deletions(-)
commit a7b012fcfa4fd0c1c53de3006a63a8bad4a08041
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
Ignore clang scanner litter
.gitignore | 1 +
1 file changed, 1 insertion(+)
commit c62ce78b8ae6961c9d1dda092781b6988488a135
Author: Stef Walter <stefw@redhat.com>
Date: 2014-08-08
trust: Don't use invalid public keys for looking up stapled extensions
https://bugs.freedesktop.org/show_bug.cgi?id=82328
trust/builder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1576ac9495333d0f285e0ab69f444d3ae0630859
Author: Stef Walter <stefw@redhat.com>
Date: 2014-08-08
trust: Print label of certificate when complaining about basic constraints
https://bugs.freedesktop.org/show_bug.cgi?id=82328
trust/builder.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
commit d9df354fffbbfa42aac796235cf446c63ad2eef8
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Double check that index bucket is valid before access
trust/index.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3748527ed4deb980a2aa0a74893ccb4384951015
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
p11-kit: Remove use after free in debug output code path
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f1d563400c9747d6c470cba7abfa9a31d92349d3
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
Quiten down scanner warnings about unused variables
p11-kit/lists.c | 5 +----
trust/list.c | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
commit 26b3e98f7934bd47ab3d387124135f254bd6f8ba
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
common: Quiet down clang scanner with assertions
Quieten down the clang scanner by telling it to expect
that our test assertions fail
common/test.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9cd9153a4d4cf78011d2a8f8c7a69aa8f3eda9f3
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
Fix mostly erroneous scanner warnings in tests
common/tests/test-array.c | 1 +
common/tests/test-dict.c | 3 +++
common/tests/test-tests.c | 2 ++
p11-kit/tests/test-deprecated.c | 6 +++++-
p11-kit/tests/test-uri.c | 3 +++
trust/tests/frob-bc.c | 1 +
trust/tests/frob-eku.c | 1 +
trust/tests/frob-ext.c | 1 +
trust/tests/frob-ku.c | 2 ++
trust/tests/frob-oid.c | 2 ++
trust/tests/test-token.c | 2 +-
11 files changed, 22 insertions(+), 2 deletions(-)
commit eb9d1fcc8e0adc38ff494af619db37013ff17cb9
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Fix leak in token loading error path
trust/token.c | 1 +
1 file changed, 1 insertion(+)
commit 4750c617829b666dd1acb2a12ca61419fa12bc26
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Fix unlikely use of uninitialized memory in token loading
trust/token.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit a35cc9be7a34e4fd012b0fa25a7091acf044a038
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Fix leak in trust list command
trust/list.c | 1 +
1 file changed, 1 insertion(+)
commit cdf540cefd7e106bc4607584dfa153d847f1a2a9
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Fix use after free and double free in extract command
trust/extract.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
commit 29325102bb93239313f4b2928f18a589731bd125
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Remove dead while condition in anchor commond
trust/anchor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2663c834561207b947f6a8e98a7661644b6c9630
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
p11-kit: Fix integer overflow in memset() argument
p11-kit/virtual.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f8c7ed390672d0749aaf0bbbad2c2af7145ebc01
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
p11-kit: Fix bad check of asprintf() return value
p11-kit/p11-kit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3a21a0bc541348803f7da01ef6c5b4baf6bc221a
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
configure.ac: Add subdir-objects to satisfy newer automakes
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 92523973caae8b195c4d39b6cf872ea09d72d497
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Fix use of invalid memory in PEM parser
trust/pem.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
commit c22e37091278ffb339c692f5c994c3393b12a254
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
trust: Parse TRUSTED CERTIFICATE openssl format even without CertAux
openssl sometimes outputs TRUSTED CERTIFICATE PEM files without the
additional CertAux (ie: trust fields) information. It simply leaves
that block out. This happens with a command like:
$ openssl x509 -in my-cert.pem -out output -trustout
trust/parser.c | 32 ++++----
trust/tests/files/openssl-trust-no-trust.pem | 27 +++++++
trust/tests/test-parser.c | 105 +++++++++++++++++++++++++++
3 files changed, 151 insertions(+), 13 deletions(-)
commit 2e503dccd889a3f83951830fda18c9357377693d
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-08
common: Allow specifying which tests to run on command line
This modifies our common unit test code so we can specify full
test paths on the command line, and restrict the run tests to
the ones specified. Order is not respected at this time.
common/test.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
commit 6a8843b3c5f6d44eb280a54653388a3de316f638
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-07
Release version 0.21.1
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 3cbe204722e2d5dfa8e8756e0b57b44c67fdd2c4
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-07
po: Add new translations: oc
Makefile.am | 2 +-
po/LINGUAS | 1 +
po/oc.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 344 insertions(+), 1 deletion(-)
commit 4f2cc97a95733e9ea8f85510b0f1e5c99053ae5e
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-07
common: Don't do repeated linear reallocation of array memory
Some mallocs (notably on Windows) have really poor behavior when
called repeatedly with a linearly growing buffer.
https://bugzilla.redhat.com/show_bug.cgi?id=985419
common/array.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit 08a017dbae88f6e57eee387b5984d0494e62d976
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-07
p11-kit: Tweak last commit, handle the not-forked case
When we hadn't forked, but were just not initialized, still return
CKR_CRYPTOKI_NOT_INITIALIZED from managed modules.
p11-kit/modules.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
commit c61187f879395bb334edba39ee6dfb91f1a9e59b
Author: Stef Walter <stef@thewalter.net>
Date: 2014-08-07
p11-kit: Don't complain about C_Finalize called in wrong process
When C_Finalize is called in the wrong process, it's often because
of a caller unaware of forking. This is a painful area of PKCS#11,
but at least for C_Finalize, lets not complain loudly about it.
p11-kit/modules.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
commit 8e132ab21378fb5fa1f44afb38c23f44b1277f7d
Author: Stef Walter <stef@thewalter.net>
Date: 2014-06-24
p11-kit: Add a new 'isolate' pkcs11 config option
This sets 'remote' appropriately to run the module in a separate
process.
https://bugs.freedesktop.org/show_bug.cgi?id=80472
doc/manual/p11-kit-sharing.xml | 4 ++++
doc/manual/pkcs11.conf.xml | 8 ++++++++
p11-kit/modules.c | 44 ++++++++++++++++++++++++++++++------------
3 files changed, 44 insertions(+), 12 deletions(-)
commit 17ea60eaf9d1b4eab9546d6dfc7e7afe83779f91
Author: Stef Walter <stef@thewalter.net>
Date: 2014-06-24
p11-kit: Cleanup and add documentation for 'remote' option
https://bugs.freedesktop.org/show_bug.cgi?id=54105
doc/manual/p11-kit.xml | 15 +++++++++++
doc/manual/pkcs11.conf.xml | 13 ++++++++++
p11-kit/rpc-transport.c | 57 ++++++++++++++++++++++--------------------
p11-kit/tests/test-transport.c | 2 +-
4 files changed, 59 insertions(+), 28 deletions(-)
commit d4289fbe420e19882d94827bd82a667a0132fccf
Author: Stef Walter <stef@thewalter.net>
Date: 2014-06-24
p11-kit: Add 'p11-kit remote' command for isolating modules
This adds a new tool to the p11-kit command called 'remote'. This
is the server side of remoting a PKCS#11 module.
doc/manual/p11-kit-sections.txt | 1 +
p11-kit/Makefile.am | 2 +
p11-kit/p11-kit.c | 69 +++++++++++++++++++++++++
p11-kit/{tests/frob-server.c => remote.c} | 86 ++++++++++++-------------------
p11-kit/remote.h | 56 ++++++++++++++++++++
p11-kit/tests/Makefile.am | 3 --
p11-kit/tests/test-transport.c | 2 +-
7 files changed, 161 insertions(+), 58 deletions(-)
commit 7ec80ff13adb167705a999b7d082c76219adc909
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-20
rpc: Implement execution of another tool to transport PKCS#11 RPC
p11-kit/Makefile.am | 3 +-
p11-kit/modules.c | 70 +++-
p11-kit/rpc-transport.c | 850 ++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc.h | 36 +-
p11-kit/tests/Makefile.am | 19 +-
p11-kit/tests/frob-server.c | 173 ++++++++
p11-kit/tests/mock-module-ep2.c | 56 +++
p11-kit/tests/test-rpc.c | 156 +++++++-
p11-kit/tests/test-transport.c | 281 +++++++++++++
9 files changed, 1600 insertions(+), 44 deletions(-)
commit 5ecfe2c8aa58a170aac2d9a9c22d7ffb3cc9442a
Author: Stef Walter <stef@thewalter.net>
Date: 2013-10-09
mock: Minor testing tweaks to mock testing
p11-kit/tests/test-mock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 989eab4f5886c7455242c04bf359619ac148d5ff
Author: Stef Walter <stef@thewalter.net>
Date: 2013-10-09
modules: Make config file and module configs overridable by tests
p11-kit/modules.c | 15 +++++++++++----
p11-kit/private.h | 7 +++++++
2 files changed, 18 insertions(+), 4 deletions(-)
commit 895f0416448c297a3d06160d748cd0e94eadb366
Author: Stef Walter <stef@thewalter.net>
Date: 2013-10-09
test: Move some file and directory code into general test stuff
common/test.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
common/test.h | 10 ++++++
trust/tests/test-token.c | 52 +++++++++++++++---------------
trust/tests/test-trust.c | 75 -------------------------------------------
trust/tests/test-trust.h | 28 ----------------
5 files changed, 119 insertions(+), 129 deletions(-)
commit ccc5e1569b360b54962e7f4cfaded8ab466b021d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-20
Add compatibility fdwalk() function
This is used when execing another process to close all open
file descriptors that we don't wish to be inherited.
common/compat.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/compat.h | 7 ++++++
configure.ac | 3 +++
3 files changed, 83 insertions(+)
commit c785ab66890ad7b73c556d6afdf2bb8a32dd50e2
Author: Stef Walter <stefw@gnome.org>
Date: 2012-08-23
rpc: Implement PKCS#11 messages/client/server code
* This enables passing around bytes which represent PKCS#11 RPC calls.
* Caller is responsible for connecting/disconnecting and so on.
* Client side caller gets a mixin from p11_rpc_client_init() to call
into, which generates callbacks with byte arrays to be transported.
* Server side calls p11_rpc_server_handle() with a CK_FUNCTION_LIST_PTR
on which relevant methods get called.
* Doesn't yet implement the actual daemon or clients etc...
https://bugs.freedesktop.org/show_bug.cgi?id=54105
common/debug.c | 1 +
common/debug.h | 1 +
common/mock.c | 7 +
common/mock.h | 3 +
doc/manual/Makefile.am | 2 +
p11-kit/Makefile.am | 2 +
p11-kit/rpc-client.c | 2092 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc-message.c | 769 +++++++++++++++++
p11-kit/rpc-message.h | 368 ++++++++
p11-kit/rpc-server.c | 1901 ++++++++++++++++++++++++++++++++++++++++
p11-kit/rpc.h | 69 ++
p11-kit/tests/Makefile.am | 1 +
p11-kit/tests/test-mock.c | 10 +-
p11-kit/tests/test-rpc.c | 939 ++++++++++++++++++++
14 files changed, 6163 insertions(+), 2 deletions(-)
commit 469e75bb8184392cb47b3cb4897589caabe56e70
Author: Andreas Metzler <ametzler@bebt.de>
Date: 2014-01-19
Fix typo: supress - > suppress
p11-kit/lists.c | 2 +-
trust/anchor.c | 2 +-
trust/extract.c | 2 +-
trust/list.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 08e4fcd2c7a9b9ea7a46bff5809a7c383f6063a9
Author: Stef Walter <stef@thewalter.net>
Date: 2014-07-04
Release version 0.20.3
NEWS | 10 ++++++++++
configure.ac | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
commit 840ec0f54daeb7c3bc37e22b6ec09ea7cfede868
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2014-07-04
Added test for non-null values in empty ID and label URI parts
p11-kit/tests/test-uri.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
commit d8c064dff11af8537d1c228927c9da82cb6b60e4
Author: Stef Walter <stef@thewalter.net>
Date: 2014-07-04
p11-kit: Mark p11_kit_be_quiet() and p11_kit_be_loud() stable
These are useful functions for callers who want to supress all output
from p11-kit library.
doc/manual/p11-kit-sections.txt | 4 ++--
p11-kit/p11-kit.h | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
commit 25e8999fd11d0b2c156f3bdd8597142dedd042cb
Author: Stef Walter <stef@thewalter.net>
Date: 2014-07-03
p11-kit: Handle managed modules correctly when forking
Correctly allow reinitialization when a process forks.
We don't yet implement checks on all entry points of a managed
module, but this allows callers to call C_Initialize again
after forking, as outlined by the PKCS#11 v2 spec.
p11-kit/modules.c | 14 ++++++++-----
p11-kit/tests/test-managed.c | 47 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 5 deletions(-)
commit a2bd1a8c5ba3c611899f7dfc27d553010899eeec
Author: Pavel A <pavel_a at live.com>
Date: 2014-07-01
common: Fixed implementation of strerror_r for WinXP
ie: when streror_s is missing in msvcrt.dll
https://bugs.freedesktop.org/show_bug.cgi?id=76594
common/compat.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
commit 6527f5d3b24a96369a24281db7593d5c4fc73408
Author: Stef Walter <stef@thewalter.net>
Date: 2014-06-25
p11-kit: Fix corrupted list when initialization of modules fail
This fixes the function call p11_kit_module_initialize() to
correctly rearrange the modules array when initializing a module
fails.
Also fixes p11_kit_modules_load_and_initialize()
p11-kit/modules.c | 2 ++
1 file changed, 2 insertions(+)
commit d21967cdcd18c8fcb749f874c492b7f6c4965817
Author: Milan Crha <mcrha@redhat.com>
Date: 2014-06-20
Don't try to symlink p11-proxy.so on windows
https://bugs.freedesktop.org/show_bug.cgi?id=76594
p11-kit/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit ead043f7f29d7d724f559fc4caab17edd8206d78
Author: Stef Walter <stef@thewalter.net>
Date: 2014-06-20
configure: Require automake 1.12 or later
We can't use automake 1.10 as serial-tests is not supported
there.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 4faa892e97e59dd6ab01b4cae3e2534663e18ba7
Author: Pavel A <pavel.aronsky@daynix.com>
Date: 2014-06-20
Proposed fix for compiler warnings in common/compat.c
when buliding for Windows (mingw).
This issue has been reported in bug #76594
a. Moved vasprintf before asprintf
b. Added prototypes for each of them
Thanks,
pa
Signed-off-by: Pavel A <pavel.aronsky@daynix.com>
common/compat.c | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
commit 98292d6bbc21168b517cdfca2635d35f2b47740d
Author: Stef Walter <stef@thewalter.net>
Date: 2014-02-13
proxy: Fix cases where modules are unloaded while in use
The proxy module would unload the PKCS#11 modules it was proxying
when C_Finalize() was called. However if a caller in another thread
was inside of a PKCS#11 function at the time, this would cause
a crash.
Change things around so that underlying modules are finalized during
the proxy C_Finalize() but not released/unloaded until the proxy
module itself is unloaded.
https://bugs.freedesktop.org/show_bug.cgi?id=74919
p11-kit/proxy.c | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
commit deca4955a6cce1dd77bbd45b9524b0f7b0825169
Author: Stef Walter <stef@thewalter.net>
Date: 2014-02-13
proxy: Remove assertions when module is not initialized
We should return CKR_CRYPTOKI_NOT_INITIALIZED rather than
assert() when proxy PKCS#11 functions are called before the
module is initialized.
https://bugs.freedesktop.org/show_bug.cgi?id=74919
p11-kit/proxy.c | 2 --
1 file changed, 2 deletions(-)
commit 44beedb8c2b4e30b421b604fb1b044402a1d1ff6
Author: Pascal Terjan <pterjan@google.com>
Date: 2014-02-09
Fix handling of mmap failure and mapping empty files
Check the return value of mmap() correctly.
Empty files cannot be mmap'd so we implement some
work around code for that.
https://bugs.freedesktop.org/show_bug.cgi?id=74773
Signed-off-by: Stef Walter <stef@thewalter.net>
common/compat.c | 11 +++++++++--
common/tests/test-compat.c | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 2 deletions(-)
commit c59a6b577b7ba1990a7dc04a894c3bc4f4671471
Author: Stef Walter <stefw@gnome.org>
Date: 2014-01-29
Support running autogen.sh from srcdir != builddir
autogen.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit 73aab81e55a2c2d0161484de756317ad32c80ddc
Author: Stef Walter <stefw@gnome.org>
Date: 2014-01-29
Don't use 'aux' directory name
Because Windows is really properly screwed up.
https://bugs.freedesktop.org/show_bug.cgi?id=74149
build/{aux => litter}/.empty | 0
configure.ac | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
commit 43c54570e97c60457ed09ffb18ad8416b640e51d
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
Release version 0.20.2
NEWS | 7 +++++++
configure.ac | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 90479889d9ee0c6f64067cb762286e6d25dca4b3
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
distcheck: Build with optimizations so we get proper warnings
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 426db01ae6c793d59b055e2ff7b14eeb14a48e68
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
test-iter: Fix use of uninitialized variable
p11-kit/tests/test-iter.c | 1 +
1 file changed, 1 insertion(+)
commit 99904e84d9f8f0637f66107807ac4ac9e3339e4a
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
trust: Add installcheck target for testing extract
This is an integration test that the extract and blacklist
functionality basics work.
More integration tests should follow, at which point we should
place the various generic testing bits into their own file.
.gitignore | 2 +
configure.ac | 1 +
trust/tests/Makefile.am | 6 ++
trust/tests/test-extract.in | 189 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 198 insertions(+)
commit 1f4f072346e388d7b6b6cf79b111952069c4e95c
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
Build in srcdir != builddir fashion by default
Naturally this doesn't apply to tarballs
.gitignore | 7 +++++++
Makefile.am | 4 ++--
autogen.sh | 3 ++-
automaint.sh | 6 +++---
build/Makefile.am | 9 ---------
build/certs/{Makefile.am => Makefile} | 2 +-
configure.ac | 2 --
doc/manual/Makefile.am | 3 ++-
8 files changed, 17 insertions(+), 19 deletions(-)
commit 9afb6eff85489614d0bc56a3a661473c25f9d892
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-14
Move gtk-doc.make into build directory
gtk-doc.make => build/gtk-doc.make | 0
doc/manual/Makefile.am | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
commit 635c22f4518200c7e106cdf507a4c89072f8b6ca
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-13
enumerate: Preload and respect blacklist across all tokens
This fixes an issue where a blacklist in one token wasn't properly
skipping anchors being extracted with extract-compat
https://bugs.freedesktop.org/show_bug.cgi?id=73558
trust/enumerate.c | 196 ++++++++++++++++++++++++++++++++-----------
trust/enumerate.h | 3 +
trust/tests/test-enumerate.c | 39 ++++++++-
3 files changed, 186 insertions(+), 52 deletions(-)
commit 6bc661e907f5382dbd9a76fb47a3b554c2ea0028
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-13
attrs: Allow NULL attribute to be passed to p11_attr_hash()
This allows simpler lookups.
https://bugs.freedesktop.org/show_bug.cgi?id=73558
common/attrs.c | 12 +++++++-----
common/tests/test-attrs.c | 3 +++
2 files changed, 10 insertions(+), 5 deletions(-)
commit 8d5bff64a7050e983c688bb5612bf4046fe96393
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-13
enumerate: Use p11_enumerate_ready() from tests
This gives a little broader testing of the enumerator
https://bugs.freedesktop.org/show_bug.cgi?id=73558
trust/enumerate.c | 5 +++--
trust/tests/test-enumerate.c | 31 ++++++++++++++++++++-----------
2 files changed, 23 insertions(+), 13 deletions(-)
commit f875bda849626cb5b894fe56985408ab7ee8f9a3
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-13
iter: Fix return value in rare memory allocation case
p11-kit/iter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bc60631d3e327fd97f53c68c5b3134e4cefad7e1
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-13
iter: Add p11_kit_iter_get_attributes() function
A simple wrapper for C_GetAttributeValue()
p11-kit/iter.c | 35 +++++++++++++++++++++++++
p11-kit/iter.h | 4 +++
p11-kit/tests/test-iter.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+)
commit f864a68195a9b8fb25c529f539077691fff924a5
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-08
Remove straggler file in the tools directory
tools/tests/test.c | 266 -----------------------------------------------------
1 file changed, 266 deletions(-)
commit e96bc57639a8837e5900a85e282dc0d8bd487fc3
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-08
Update translations from transifex
po/da.po | 169 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 85 insertions(+), 84 deletions(-)
commit ae7c79d466deff4c37587f11531327c8fa5f534c
Author: Stef Walter <stef@thewalter.net>
Date: 2014-01-08
Fix typo in mock.c
Reported-by: Tijl Coosemans <tijl@FreeBSD.org>
common/mock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 157941cbd75492b0c74ff21f95de3093cf6d4aca
Author: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: 2013-11-26
Check if pthread and nanosleep() are in libc before linking other libs
In recent versions of glibc this is true and prevents linking with
pthreads when it is not necessary.
Tweaked by Stef Walter
Signed-off-by: Stef Walter <stef@thewalter.net>
configure.ac | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
commit ec02489eca1b7b57c35db71bce5a6f7b876e535e
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2013-11-08
Drop unused libtasn1.h include
It's not only unsed, but also causes build fail because CFLAGS
for tests does not contain LIBTASN1_CFLAGS.
Signed-off-by: Stef Walter <stef@thewalter.net>
https://bugs.freedesktop.org/show_bug.cgi?id=71379
common/tests/frob-getauxval.c | 2 --
1 file changed, 2 deletions(-)
commit 5ed8c3d3ede6ef30e4b5a40db1438dd6231d5088
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-13
trust: Check for race in BasicConstraints stapled extension
Related to the following bug:
https://bugs.freedesktop.org/show_bug.cgi?id=69314
trust/tests/test-builder.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
commit beb377f7479e834366be60dc6c1da2e53278e091
Author: Andreas Metzler <ametzler@debian.org>
Date: 2013-10-01
Disable tests with setgid binaries when running in fakeroot
We use the FAKED_MODE environment variable as a way to detect
fakeroot.
common/tests/test-compat.c | 5 ++++-
p11-kit/tests/test-conf.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
commit 895327695f141d5bce5e260b80b5ec01796b214a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-09-08
Fix documentation build
doc/manual/Makefile.am | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
commit b5f7f7023365c31d0d26ce91e29c801fe9bec1ed
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-09
Update from transifex and string changes
po/LINGUAS | 36 +++++-
po/ar.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/as.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/az.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/bg.po | 4 +-
po/bn_IN.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ca.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ca@valencia.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/cs.po | 4 +-
po/cy.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/da.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/de.po | 5 +-
po/el.po | 4 +-
po/en_GB.po | 4 +-
po/eo.po | 4 +-
po/es.po | 5 +-
po/es_CL.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/eu.po | 4 +-
po/fa.po | 4 +-
po/fi.po | 5 +-
po/fo.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/fr.po | 4 +-
po/ga.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/gl.po | 5 +-
po/gu.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/he.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/hi.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/hr.po | 5 +-
po/hu.po | 5 +-
po/ia.po | 4 +-
po/id.po | 5 +-
po/it.po | 5 +-
po/it_IT.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ja.po | 5 +-
po/ka.po | 5 +-
po/kk.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/kn.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ko.po | 5 +-
po/lt.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/lv.po | 5 +-
po/ml.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/mr.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ms.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/nb.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/nl.po | 5 +-
po/nn.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/or.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pa.po | 4 +-
po/pl.po | 5 +-
po/pt.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pt_BR.po | 5 +-
po/ro.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ru.po | 4 +-
po/sk.po | 4 +-
po/sl.po | 5 +-
po/sq.po | 4 +-
po/sr.po | 5 +-
po/sr@latin.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sv.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ta.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/te.po | 4 +-
po/th.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/tr.po | 4 +-
po/uk.po | 5 +-
po/vi.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/wa.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_CN.po | 4 +-
po/zh_HK.po | 4 +-
po/zh_TW.po | 4 +-
69 files changed, 11068 insertions(+), 74 deletions(-)
commit 247e31c94666fbeab08a5dc67b0b8f7a3edbef27
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-09
Release version 0.20.1
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 88ac590d2e9786d5b364aac7a23b2b0567e87020
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-09
Remove unused make variables
common/tests/Makefile.am | 6 ++----
p11-kit/tests/Makefile.am | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
commit 8d834060b5af54dcc9581840dfb6452a17a7a7d3
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-05
extract-compat: Skip extraction if running as non-root
trust/trust-extract-compat.in | 6 ++++++
1 file changed, 6 insertions(+)
commit a5713df2c05debd269615226b41e1e0b83de2ba3
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-05
anchor: Run extract-compat after we've changed something
When the 'trust anchor' tool changes something, run
'trust extract-compat' after that point
trust/anchor.c | 44 +++++++++++++++++++++++++++++++++-----------
1 file changed, 33 insertions(+), 11 deletions(-)
commit 00dc2340eab9f9504ef78006686802eb8e3542ad
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-05
trust: More appropriate rv when non-modifiable object deleted
This will change once the spec has a specific attribute and code
to signify deletability.
trust/anchor.c | 1 +
trust/module.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 3c7553a1fd47671a98a6d496ac7eeedb1b43df7c
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-05
anchor: Better failure messages when removing anchors
trust/anchor.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
commit 2476ecb35e175a45ba72101ddfa38b2d048323bb
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-05
messages: Better message for CKR_FUNCTION_REJECTED
p11-kit/messages.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 40631193e4979426f10e5244f477d3c411f8e6c3
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-04
Release version 0.20.0
NEWS | 3 +++
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 11619d1ddb682ad8f42676732e2179fdcd810566
Author: Stef Walter <stef@thewalter.net>
Date: 2013-09-04
Documentation tweaks
doc/manual/p11-kit-config.xml | 2 +-
doc/manual/p11-kit-sections.txt | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
commit b4faa7f7e17dea909cd4393d27adbc21b2dea9fb
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-29
Release version 0.19.4
NEWS | 10 ++++++++++
configure.ac | 2 +-
doc/manual/Makefile.am | 3 +++
trust/Makefile.am | 2 +-
trust/anchor.c | 2 +-
trust/extract.c | 4 ++--
6 files changed, 18 insertions(+), 5 deletions(-)
commit c980eb29619edc28610a03ccb62514683604257c
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-29
Route 'p11-kit extract-trust' over to trust tool
The actual command is 'trust extract-compat'. Make installed placeholder
script reflect this. We still support the old placeholder script
if it is present.
.gitignore | 1 +
configure.ac | 2 +-
p11-kit/p11-kit.c | 58 +++++++++++-----------
trust/Makefile.am | 3 +-
trust/extract.c | 38 ++++++++++++++
trust/extract.h | 3 ++
...it-extract-trust.in => trust-extract-compat.in} | 10 ++--
trust/trust.c | 1 +
8 files changed, 81 insertions(+), 35 deletions(-)
commit f2beacb7c59b9c4b41b00da993c747fd814882a8
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-29
trust: Document the new command line trust tool
.gitignore | 1 +
doc/manual/Makefile.am | 4 +
doc/manual/p11-kit-docs.xml | 1 +
doc/manual/p11-kit-trust.xml | 5 +-
doc/manual/p11-kit.xml | 145 +----------------
doc/manual/trust.xml | 368 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 385 insertions(+), 139 deletions(-)
commit 5c19a0e8f5d07a4defb3239a89c224c5f5f9eef4
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-28
trust: Add 'trust anchor --remove' command
Also prevent --store from storing an anchor multiple times
trust/anchor.c | 417 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 365 insertions(+), 52 deletions(-)
commit 2e6d7d3a1e03dc2dbcd98c995bd2d6e5906680d9
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-28
trust: Add a list command to the trust tool
Lists with PKCS#11 URI's and some basic fields.
trust/Makefile.am | 1 +
trust/list.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/list.h | 43 ++++++++++
trust/trust.c | 4 +-
4 files changed, 294 insertions(+), 1 deletion(-)
commit dee46ac0c6287fbd57ec9b57ddeade27933fea05
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-28
trust: Add support for removing trust token objects
trust/tests/test-token.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 87 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 185 insertions(+), 1 deletion(-)
commit b693517966b1cbe5b81e39aeefad7b52b6f10492
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-28
trust: Refactor enumeration of certificates to extract
Because we want to use this same logic for listing trust
trust/Makefile.am | 2 +-
trust/{extract-info.c => enumerate.c} | 228 ++++++++++++++++++-----
trust/enumerate.h | 103 ++++++++++
trust/extract-cer.c | 18 +-
trust/extract-jks.c | 13 +-
trust/extract-openssl.c | 36 ++--
trust/extract-pem.c | 20 +-
trust/extract.c | 180 ++----------------
trust/extract.h | 84 ++-------
trust/tests/Makefile.am | 14 +-
trust/tests/test-bundle.c | 62 +++---
trust/tests/test-cer.c | 62 +++---
trust/tests/{test-extract.c => test-enumerate.c} | 151 +++++++--------
trust/tests/test-openssl.c | 111 ++++++-----
14 files changed, 541 insertions(+), 543 deletions(-)
commit 714e4a22a82295c41360fbfa6019a31b1e2a0f30
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
trust: Do reload object removals inside a loading block
So that validation/storage logic doesn't kick in if a file was
removed outside of p11-kit trust module.
trust/token.c | 4 ++++
1 file changed, 4 insertions(+)
commit 570403f3421b222167196d380c60eb8430eb4cd7
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-28
trust: Add index callback for when an object is removed
This allows a token to remove the file if desired
trust/index.c | 25 ++++++++++++
trust/index.h | 5 +++
trust/session.c | 2 +-
trust/tests/test-builder.c | 2 +-
trust/tests/test-index.c | 99 ++++++++++++++++++++++++++++++++++++++++++----
trust/token.c | 1 +
6 files changed, 125 insertions(+), 9 deletions(-)
commit 58466648aa84ea10c20213d4665c5c93dbf285e9
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
trust: Prefer parsing the persist format to PEM
This is because the persist format contains PEM, and if the PEM
parser gets it first, then it'll ignore the other non PEM data.
trust/token.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 619e81b5ffe0677d1d511ef60b8451434c2a32a0
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
trust: Correctly rewrite other objects in a modifiable persist file
There was a bug where we were rewriting the modified object
multiple times.
trust/tests/test-token.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 2 +-
2 files changed, 75 insertions(+), 1 deletion(-)
commit 8a9a90e197d67c58898e959358b9a13482732d3d
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
Add p11-kit style typedefs for iter and uri
In general we're slowly migrating towards the lower case style
for stuctures/objects.
p11-kit/iter.h | 1 +
p11-kit/uri.h | 1 +
2 files changed, 2 insertions(+)
commit 1fac2b92d6c53655086a2cc3a653b8e78d92a043
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
iter: Add a p11_kit_iter_destroy_object() function
Handy function since this is a common need.
doc/manual/p11-kit-sections.txt | 1 +
p11-kit/iter.c | 18 ++++++++++++++++++
p11-kit/iter.h | 1 +
p11-kit/tests/test-iter.c | 40 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 60 insertions(+)
commit dec3efbaf4a6550bc45d1b9926e4d66b93306802
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
iter: Add p11_kit_iter_set_uri() function
This is so we can set a filtering uri on the iterator after construction
doc/manual/p11-kit-sections.txt | 3 ++-
p11-kit/iter.c | 41 ++++++++++++++++++++++++++++++++++-------
p11-kit/iter.h | 3 +++
p11-kit/tests/test-iter.c | 28 ++++++++++++++++++++++++++++
4 files changed, 67 insertions(+), 8 deletions(-)
commit c15dca006ca69c26ec083a4f2d4aac76b9f30d52
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
iter: Add p11_kit_iter_get_token() call
To get the already loaded CK_TOKEN_INFO during iteration for the
token that the current object is on.
doc/manual/p11-kit-sections.txt | 1 +
p11-kit/iter.c | 25 +++++++++++++++++++++----
p11-kit/iter.h | 2 ++
p11-kit/tests/test-iter.c | 32 ++++++++++++++++++++++++++++++++
4 files changed, 56 insertions(+), 4 deletions(-)
commit 3f357776c15255710997e61ca305aa5a2ce5cf02
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
iter: Add new P11_KIT_ITER_WANT_WRITABLE iterator behavior
This allows us to try to get a RW session, but if not fallback
to a read-only session.
doc/manual/p11-kit-sections.txt | 1 -
p11-kit/iter.c | 36 ++++++++++++++----------------------
p11-kit/iter.h | 4 +---
p11-kit/tests/test-iter.c | 4 +---
4 files changed, 16 insertions(+), 29 deletions(-)
commit 22220bda09585239533b6a9fef6de51c1ddc2ae6
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
tool: Only include debug lines marked 'tool' when --verbose
Otherwise we get all sorts of overwhelming internal debugging
when someone specifies --verbose argument to a tool.
common/tool.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 7f6fd42ea33e09687487e8981e02080c8a6c7b40
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
debug: Allow debug lines longer than 512 characters
Since fprintf (stderr, ...) already doesn't print atomically, we don't
lose any atomicity here. If we want to print atomically this will need
some further reworking anyway.
common/debug.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 095a385ead70651536d29c7ddab53f42592a3ef5
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
debug: Add missing 'tool' flag to debug flags
common/debug.c | 1 +
1 file changed, 1 insertion(+)
commit e835d0f6eae21e1b6f13b8ad585c179bbf1eb946
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-27
p11-kit: Rename list.c to lists.c to simplify debugging
p11-kit/Makefile.am | 2 +-
p11-kit/{list.c => lists.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
commit cdad5bceee79afbf8b3440b39c72890d2e67448d
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-26
Avoid multiple stat() calls for same file
As a side effect we can also not use the dirent.d_type field
https://bugs.freedesktop.org/show_bug.cgi?id=68525
common/compat.c | 39 ++++++++++++++++++++++++++++-----------
common/compat.h | 3 +++
common/test.c | 2 +-
configure.ac | 1 -
p11-kit/conf.c | 35 ++++++++++++++++-------------------
p11-kit/conf.h | 3 ++-
p11-kit/tests/test-conf.c | 6 +++---
trust/anchor.c | 2 +-
trust/parser.c | 3 ++-
trust/parser.h | 1 +
trust/save.c | 14 ++------------
trust/tests/frob-cert.c | 2 +-
trust/tests/test-module.c | 4 ++--
trust/tests/test-parser.c | 20 ++++++++++----------
trust/tests/test-token.c | 12 +++++++-----
trust/token.c | 2 +-
16 files changed, 80 insertions(+), 69 deletions(-)
commit e1042e93488f2b38abeea58b65440111df69afdc
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-26
compat: Check return value of mmap() properly
https://bugs.freedesktop.org/show_bug.cgi?id=68525
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 2978f8fb27681e9f40575ae2be26012e8a54fc71
Author: Pascal Ernster <bugs.freedesktop.org@hardfalcon.net>
Date: 2013-08-16
Add --with-module-config parameter to the configure script
https://bugs.freedesktop.org/show_bug.cgi?id=68122
configure.ac | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit c777194f0a8d00bcb4e1dc89beebcadf2249ddc0
Author: Stef Walter <stef@thewalter.net>
Date: 2013-08-12
trust: Add test tool for creating BasicConstraints
trust/tests/Makefile.am | 1 +
trust/tests/frob-bc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+)
commit 4b1d38759c8cdc85b9ab9ce3a8a24a0dc28f2aa6
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2013-07-30
test-compat calls test_getauxval which is in a UNIX defined block
MinGW builds fail due to this.
https://bugs.freedesktop.org/show_bug.cgi?id=67518
common/tests/test-compat.c | 2 ++
1 file changed, 2 insertions(+)
commit cdb1a88ba117d92991298445e5db51b6e1f5ce3c
Author: Alon Bar-Lev <alon.barlev@gmail.com>
Date: 2013-07-27
do not assume dead code existence in autoconf checks
when compiler optimize source, it removes dead code so a linkage error
in these cases are not visisble.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=67413
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 68beea0bca786730019df002fa625986a4d65d91
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Release version 0.19.3
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 2e7952e62ef205c67175e3e717526e4375ca8325
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Make tests work on file systems with block size directories
On certain file systems the size of the directory does not
change when adding a file. This caused the tests to fail. Make
the tests wait more than a second in certain tests to get the
mtime to change.
https://bugs.freedesktop.org/show_bug.cgi?id=65249
trust/tests/test-token.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 02a3bbd560bdb56501fea1b46c5583582832b008
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Fix uninitialized variables
trust/anchor.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 6b457ffc260100e0e3e6b2143b00e34bb419665e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Don't use _GNU_SOURCE and fix strerror_r usage
glibc declares strerror_r completely different if in POSIX or GNU
mode. Nastiness. Stop using _GNU_SOURCE all together.
common/compat.h | 10 ++++---
common/message.c | 6 +++++
common/test.c | 1 +
common/tests/Makefile.am | 1 +
common/tests/test-message.c | 65 +++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 +--
trust/token.c | 2 +-
7 files changed, 83 insertions(+), 6 deletions(-)
commit b14fc0351c4dd71c5ca71df77e325d2b2a4c0583
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Fix various memory leaks exposed by 'make leakcheck'
common/tests/test-path.c | 90 ++++++++++++++++++++++++----------------------
p11-kit/modules.c | 2 ++
trust/asn1.c | 4 ++-
trust/builder.c | 6 ++--
trust/extract-openssl.c | 1 +
trust/index.c | 2 +-
trust/parser.c | 1 +
trust/tests/Makefile.am | 12 +++----
trust/tests/test-asn1.c | 3 +-
trust/tests/test-builder.c | 4 +++
trust/token.c | 10 ++++--
11 files changed, 79 insertions(+), 56 deletions(-)
commit b7cc29a78c3c705374ff25223fe14749ddb076b9
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Use simple serial automake test harness
* Add a testing sanity check to see if we're catching errors
* Fix a few other testing issues
build/Makefile.tests | 2 +-
common/test.c | 2 +-
common/tests/Makefile.am | 1 +
common/tests/test-compat.c | 4 +-
common/tests/test-tests.c | 93 +++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
p11-kit/conf.c | 2 +-
p11-kit/tests/test-deprecated.c | 1 +
p11-kit/tests/test-init.c | 1 +
trust/builder.c | 2 +-
trust/tests/test-builder.c | 12 ++++--
trust/token.c | 3 +-
12 files changed, 113 insertions(+), 12 deletions(-)
commit 4d04cfdf2ac078cc4a95ff9a145f0045e074470b
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-23
Use an automake aux directory for storing litter
build/aux/.empty | 1 +
configure.ac | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
commit 884819d4028faa77d38a99d3f63376b2f4fdfcd4
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
doc: Add identifiers to doc sections so gtk-doc doesn't autogen them
doc/manual/p11-kit-config.xml | 2 +-
doc/manual/p11-kit.xml | 12 ++++++------
doc/manual/pkcs11.conf.xml | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
commit 86060d6b17fa3848e60aaff9be7768a761c7c428
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Add appropriate const qualifiers
p11-kit/conf.c | 2 +-
trust/extract-openssl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 263a83278bd305eb2951907faa3fe08a79fcdeec
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Release version 0.19.2
NEWS | 20 +++++++++++++++++++-
configure.ac | 2 +-
2 files changed, 20 insertions(+), 2 deletions(-)
commit d8532de9570fd7501b8b25ff10ab05392f3a1d42
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Fix extract example in documentation
doc/manual/p11-kit.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 91bbe5ad80a760a58d5eba48f65ddd07fa56a953
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Use $XDG_CONFIG_HOME/pkcs11 as default user config directory
By default this evaluates to ~/.config/pkcs11. This is a somewhat
backwards incompatible change. However so far only advanced users
have been exposed to the user p11-kit configuration.
Distributors are able to revert this if necessary with a
--with-user-config='~/.pkcs11' ./configure option.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit a1a398ae150cee642efaa03f28e8457c75185d55
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Use getpwuid_r() instead of the non-thread-sofe getpwuid()
common/path.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
commit b03be8429847451ddf25508b3dc3c520e96a2cc3
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-18
Fix p11_kit_space_strlen() result when empty string
https://bugzilla.redhat.com/show_bug.cgi?id=985416
p11-kit/tests/Makefile.am | 1 +
p11-kit/tests/test-util.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/util.c | 6 ++---
3 files changed, 63 insertions(+), 3 deletions(-)
commit 2a69ff5691e114362564a2ab572cd4b3b20dcc27
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Always pass size_t varargs to p11_hash_xxx() functions
https://bugzilla.redhat.com/show_bug.cgi?id=985421
trust/extract-jks.c | 4 ++--
trust/extract-openssl.c | 2 +-
trust/x509.c | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
commit 1548d82560b242579f5ba216b66bd59ccd0f3fd0
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Don't call memdup with zero length or NULL pointer
https://bugzilla.redhat.com/show_bug.cgi?id=985433
common/attrs.c | 9 +++++++--
p11-kit/pin.c | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
commit 29a5df009656dc09be781c4939cec3613a0a12cb
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
attrs: Check printf formatting in buffer_append_printf()
https://bugzilla.redhat.com/show_bug.cgi?id=985497
common/attrs.c | 5 +++++
1 file changed, 5 insertions(+)
commit 9a1fe66f08149596567fedb4e2338ae786a19ab9
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Avoid using the non-thread-safe strerror() function
https://bugzilla.redhat.com/show_bug.cgi?id=985481
common/compat.c | 16 ++++
common/compat.h | 8 ++
common/message.c | 26 ++++++
common/message.h | 4 +
common/path.c | 3 +-
configure.ac | 2 +-
p11-kit/conf.c | 6 +-
tools/tests/test.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/parser.c | 2 +-
trust/save.c | 47 ++++------
trust/token.c | 19 ++--
11 files changed, 348 insertions(+), 51 deletions(-)
commit e403f7b33ac35e961c72ed1b6335bbe3084e4642
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Declare static variables const where it makes sense
https://bugzilla.redhat.com/show_bug.cgi?id=985337
common/path.c | 8 ++++----
p11-kit/conf.c | 4 ++--
p11-kit/uri.c | 4 ++--
trust/builder.c | 38 +++++++++++++++++++-------------------
trust/extract-info.c | 2 +-
trust/extract-openssl.c | 2 +-
trust/module.c | 4 ++--
7 files changed, 31 insertions(+), 31 deletions(-)
commit 52a84b84a924a9f1cd8090b0a47b9f7d00ca69f3
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Support expanding $XDG_CONFIG_HOME in user config paths
If ~/.config is specified as a prefix to a configured path,
then it is expanded to the $XDG_CONFIG_HOME if that exists
Add --with-user-config ./configure option to configure a
different user config directory.
Interpolate the right directories into documentation.
.gitignore | 2 ++
common/path.c | 37 ++++++++++++++++++++++++-------------
common/tests/test-path.c | 6 ++++++
configure.ac | 8 ++++++--
doc/manual/Makefile.am | 17 +++++++++++++++--
doc/manual/p11-kit-config.xml | 18 +++++++++++-------
doc/manual/p11-kit-devel.xml | 10 ++++++++++
doc/manual/p11-kit-trust.xml | 10 +++++++---
doc/manual/pkcs11.conf.xml | 14 +++++++++-----
doc/manual/version.xml.in | 1 -
p11-kit/pkcs11.conf.example.in | 2 +-
11 files changed, 91 insertions(+), 34 deletions(-)
commit 936e4c229a4ed205e9981fc4f31acea063701b69
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Don't load configs from user directory when setuid
When running as setuid() or setgid() don't access the user's home
directory, or use $HOME environment variables.
https://bugzilla.redhat.com/show_bug.cgi?id=985014
common/compat.c | 48 +++++++++++++
common/compat.h | 12 ++++
common/path.c | 5 ++
common/test.c | 99 +++++++++++++++++++++++++++
common/test.h | 9 +++
common/tests/Makefile.am | 5 +-
common/tests/frob-getauxval.c | 63 +++++++++++++++++
common/tests/test-compat.c | 30 ++++++++
configure.ac | 3 +
doc/manual/p11-kit-config.xml | 3 +
doc/manual/pkcs11.conf.xml | 3 +
p11-kit/conf.c | 5 ++
p11-kit/tests/Makefile.am | 1 +
p11-kit/tests/files/system-modules/one.module | 3 +-
p11-kit/tests/files/user-modules/one.module | 3 +-
p11-kit/tests/frob-setuid.c | 95 +++++++++++++++++++++++++
p11-kit/tests/test-conf.c | 39 +++++++++++
17 files changed, 423 insertions(+), 3 deletions(-)
commit 81a6e16539e5e4a27c55194ae095cc4a75d08ade
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
tools: Use $TMPDIR instead of $TEMP
TMPDIR is a more standard environment variable for locating the
temp directory on Unix. In addition since this is only used in
tests, remove the code from the generic p11_path_expand() func.
In general remove the possibility for forks to put $HOME or $TEMP
environment variables in configured paths. This was possible
due to code in p11_path_expand() but not something we supported.
https://bugzilla.redhat.com/show_bug.cgi?id=985017
common/path.c | 44 -----------------------------------
common/test.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++
common/test.h | 2 ++
common/tests/test-path.c | 31 +------------------------
trust/tests/test-bundle.c | 4 +---
trust/tests/test-cer.c | 4 +---
trust/tests/test-module.c | 4 +---
trust/tests/test-openssl.c | 4 +---
trust/tests/test-save.c | 4 +---
trust/tests/test-token.c | 9 ++------
trust/tests/test-trust.c | 6 +++++
11 files changed, 73 insertions(+), 96 deletions(-)
commit eb8f5859b1349f8147ba47a1da8032df192f2370
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Fix various issues highlighted by coverity scanner
Among others fix possible usage of large stack allocation.
common/hash.c | 1 +
common/lexer.c | 3 ++-
p11-kit/iter.c | 12 ++++++------
p11-kit/p11-kit.c | 6 ++++++
p11-kit/tests/test-init.c | 3 +++
trust/extract.c | 20 ++++++++++----------
trust/index.c | 18 +++++++++---------
trust/parser.c | 2 +-
trust/tests/frob-nss-trust.c | 1 +
trust/tests/test-index.c | 7 ++++---
10 files changed, 43 insertions(+), 30 deletions(-)
commit ab1caffd9e09fd4d6ab92713de29436db0da6dea
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-16
open files with O_CLOEXEC when possible
This helps prevent leaked file descriptors when the library is
used in a process which exec's.
opendir() already uses O_CLOEXEC on platforms that support O_CLOEXEC
so we don't need to make changes there.
In addition read config files using p11_mmap_open() so that we get
the simple benefits of O_CLOEXEC with the open() call there.
https://bugzilla.redhat.com/show_bug.cgi?id=984986
common/compat.c | 18 ++++++++--
common/compat.h | 4 +++
p11-kit/conf.c | 101 +++++++++++++++-----------------------------------------
p11-kit/pin.c | 2 +-
4 files changed, 46 insertions(+), 79 deletions(-)
commit 9886b39e2ebd2f711b5b0c3ca2e24694a9ffd361
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-16
buffer: Check for unlikely integer overflow
If we see an integer overflow here something has gone horribly wrong
(or malicious code is present). So treat this as unrecoverable, and
fail if we're going to overflow.
https://bugzilla.redhat.com/show_bug.cgi?id=985019
common/buffer.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 0ddd67184b65dfde0e5d05a957f01eeca161e384
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-16
Make preconditions abort unconditionally when scanning with coverity
This reflects that preconditions are invalid/unreachable on a
functioning system and with valid input. We do not try to recover
from such conditions.
In addition teach coverity about how our test suite fails
See http://p11-glue.freedesktop.org/doc/p11-kit/devel-building-style.html
https://bugzilla.redhat.com/show_bug.cgi?id=985005
common/debug.c | 4 ++++
common/test.c | 5 +++++
2 files changed, 9 insertions(+)
commit b2e6bc0ea2b2d2b90f6a159a23a4e676b1f302e4
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-16
iter: Document guarantees for filter matches argumet
The matches argument is always initialized to CK_TRUE when a filter
is called, and it's up to filters to set it to CK_FALSE. Filters
don't need to set to CK_TRUE.
https://bugzilla.redhat.com/show_bug.cgi?id=985009
p11-kit/iter.c | 4 ++++
1 file changed, 4 insertions(+)
commit 3f9da410144fd45ee6250dda28cae49300077e29
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-17
Fixes for some recent win32 regressions
common/path.c | 21 ++++++++++++++++++---
trust/save.c | 22 ++++++++++------------
trust/token.c | 10 +++++++++-
3 files changed, 37 insertions(+), 16 deletions(-)
commit 82738fe7d6143cb25fc1cb201a75b8a071043be8
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-16
Remove erroneous comments about readdir() and thread-safety
https://bugzilla.redhat.com/show_bug.cgi?id=984989
p11-kit/conf.c | 1 -
trust/save.c | 1 -
trust/token.c | 1 -
3 files changed, 3 deletions(-)
commit d00f6b24e5349d8d37868b8f4451b1dc9b38767e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-10
Build with -fno-common to catch definition problems
Fix some global variables not declared as extern
https://bugs.freedesktop.org/show_bug.cgi?id=66015
configure.ac | 2 +-
p11-kit/virtual.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit fb039d0c292c3cd339179bdc98a09d4103fb9c5f
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-10
Various documentation tweaks and fixes for warnings
doc/manual/p11-kit-devel.xml | 2 +-
doc/manual/p11-kit-sections.txt | 4 ++++
p11-kit/iter.c | 8 ++++++++
3 files changed, 13 insertions(+), 1 deletion(-)
commit edd04b610c1c83f26ed036569ad95b89a41fc558
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-10
Add support for using freebl3 for SHA1 and MD5 hashing
Since we don't want to link freebl3 to libp11-kit.so where it isn't
needed, move the SHA-1 and MD5 digest functionality to the trust/
directory.
common/hash.c | 502 ----------------------------------
common/hash.h | 20 --
common/tests/test-hash.c | 92 -------
configure.ac | 33 +++
doc/manual/p11-kit-devel.xml | 11 +
trust/Makefile.am | 4 +
trust/builder.c | 16 +-
trust/digest.c | 632 +++++++++++++++++++++++++++++++++++++++++++
trust/digest.h | 60 ++++
trust/extract-jks.c | 14 +-
trust/extract-openssl.c | 10 +-
trust/parser.c | 4 +-
trust/tests/Makefile.am | 9 +-
trust/tests/test-builder.c | 6 +-
trust/tests/test-digest.c | 143 ++++++++++
trust/tests/test-module.c | 10 +-
trust/x509.c | 4 +-
17 files changed, 922 insertions(+), 648 deletions(-)
commit eca5a6e491f5f85ba1f06afcea3177c3442ae557
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-09
trust: Fix the 'p11-kit extract' command
This is supposed to call over to 'trust extract' and wasn't
working correctly.
p11-kit/Makefile.am | 1 +
p11-kit/p11-kit.c | 22 ++++++++++++++++++++--
trust/extract.c | 2 +-
3 files changed, 22 insertions(+), 3 deletions(-)
commit a314ab2aa9dbfcbc8d2d9a84554265e498520a20
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Fix bug with load validation failures
trust/index.c | 5 +++--
trust/tests/test-index.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
commit 3c36c7a68dfefdf75f7239dd7e006e7eb1366620
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Add a basic 'anchor' command to store a new anchor
trust/Makefile.am | 3 +
trust/anchor.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
trust/anchor.h | 43 ++++++++
trust/trust.c | 2 +
4 files changed, 348 insertions(+)
commit dcca67d72544e394f43a8c62840692c85d5b5b29
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Fix various issues writing objects in trust token
* Create directory before trying to write files to it
* Handle write failures appropriately
Refactor how we build and store objects in the index to handle
the above cases properly.
trust/builder.c | 152 +++++++++--------------------
trust/builder.h | 5 +-
trust/index.c | 129 ++++++++++++++++++++++--
trust/index.h | 11 ++-
trust/session.c | 2 +-
trust/tests/test-builder.c | 238 ++++++++++++++++++++++++++++++++-------------
trust/tests/test-index.c | 32 +++---
trust/token.c | 166 +++++++++++++++++++++----------
8 files changed, 483 insertions(+), 252 deletions(-)
commit 3318c443b7a3660f0aee80cfa0d5e915d3a21734
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Mark CKA_X_DISTRUSTED as a boolean attribute
trust/persist.c | 1 +
1 file changed, 1 insertion(+)
commit c0a2fe9c974b51e7495d0598a925c07744d895de
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Support token directory paths in user's home directory
trust/module.c | 1 +
trust/token.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 2c4f5ed657976d868c33f0ddf430477ee2bf0191
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Explicitly specify which formats parser should parse
trust/parser.c | 69 +++++++++++++++++++++++++++++------------------
trust/parser.h | 18 +++++++++++--
trust/tests/test-module.c | 2 ++
trust/tests/test-parser.c | 10 +++++++
trust/token.c | 2 ++
5 files changed, 73 insertions(+), 28 deletions(-)
commit 03787ae83b1911118a7a689c4817bbce1e74dabd
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
trust: Support using the parser without an asn1_cache
trust/asn1.c | 11 ++++++++---
trust/parser.c | 15 +++++++++++----
trust/tests/test-parser.c | 22 ++++++++++++++++++++++
3 files changed, 41 insertions(+), 7 deletions(-)
commit 9f7c426d5a6bfb0e60895a690ed835c47e04cb4e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
asn1: In p11_asn1_read() allocate an extra null terminator
As a courtesy for callers.
trust/asn1.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit 09ece36663a3672dfa2db97029cfd5f5360188e8
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-08
common: Fix typo, and don't escape '6' in URL encoding
common/url.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 75e2cb73df51a2688ecd2f4b4e3b490ae7b9f5a7
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-04
p11-kit: Add P11_KIT_MODULE_TRUSTED flag
A new flag to pass to p11_kit_modules_load() and related functions
which limits loaded modules to ones with "trust-policy: yes".
p11-kit/modules.c | 48 +++++++++++++++---------
p11-kit/p11-kit.h | 1 +
p11-kit/tests/files/package-modules/four.module | 3 +-
p11-kit/tests/files/system-modules/one.module | 3 +-
p11-kit/tests/test-modules.c | 50 +++++++++++++++++++++++++
trust/extract.c | 49 ++++++------------------
6 files changed, 98 insertions(+), 56 deletions(-)
commit 7d4941715b5afc2ef8ea18716990d28965737c70
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-04
trust: Port to use CKA_PUBLIC_KEY_INFO and updated trust store spec
* Use the concepts and PKCS#11 objects described in the
recently updated (still work in progress) storing trust spec.
* Define our own CKA_X_PUBLIC_KEY_INFO define for now, since the
the CKA_PUBLIC_KEY_INFO isn't defined yet.
* Most notably, the association between certificates and stapled
extensions is by public key.
* Rework some of the tests to take into account the above.
build/certs/Makefile.am | 19 ++--
common/attrs.c | 1 +
common/constants.c | 1 +
common/pkcs11x.h | 1 +
trust/builder.c | 118 +++++++++++++--------
trust/extract-info.c | 112 ++++++++++++-------
trust/extract-openssl.c | 37 ++++---
trust/parser.c | 109 +++++++++++++------
trust/tests/Makefile.am | 1 +
.../{cacert3-trusted-multiple.pem => multiple.pem} | 53 +++------
trust/tests/files/verisign-v1.pem | 15 +++
trust/tests/frob-eku.c | 1 +
trust/tests/frob-ext.c | 118 +++++++++++++++++++++
trust/tests/test-builder.c | 59 ++++++++---
trust/tests/test-extract.c | 7 +-
trust/tests/test-openssl.c | 33 ++++--
trust/tests/test-parser.c | 30 ++++--
trust/tests/test-trust.h | 62 +++++++++++
18 files changed, 561 insertions(+), 216 deletions(-)
commit 2be55821c1ffab99b91c76c43c91dd95db1c21c7
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-04
trust: Add p11_oid_hash() and various oid strings
trust/oid.c | 13 +++++++++++++
trust/oid.h | 7 +++++++
trust/tests/test-oid.c | 19 ++++++++++++++-----
3 files changed, 34 insertions(+), 5 deletions(-)
commit ec7c2ff2011d774217c1e35d664072d0487853c7
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-04
trust: Add p11_asn1_read() and p11_asn1_free() functions
Some helpers for commonly used ASN.1 related stuff.
trust/asn1.c | 38 ++++++++++++++++++++++++++++++++++++++
trust/asn1.h | 6 ++++++
trust/parser.c | 16 +++-------------
trust/persist.c | 11 ++---------
trust/tests/test-asn1.c | 19 +++++++++++++++++++
trust/x509.c | 42 ++++++------------------------------------
6 files changed, 74 insertions(+), 58 deletions(-)
commit a2165fe35e336fd807af053a21a396b020f90a23
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
trust: Initial support for writing out token objects
* The objects are written out in the p11-kit persist format
* Parser marks files in p11-kit persist format as modifiable
trust/Makefile.am | 1 +
trust/module.c | 18 ++--
trust/parser.c | 2 +-
trust/tests/test-module.c | 126 +++++++++++++++++++++++++--
trust/tests/test-parser.c | 1 -
trust/tests/test-token.c | 110 ++++++++++++++++++++++-
trust/tests/test-trust.c | 1 -
trust/token.c | 218 +++++++++++++++++++++++++++++++++++++++++-----
trust/token.h | 5 +-
9 files changed, 443 insertions(+), 39 deletions(-)
commit 269c4c2e82543de273fa9415dec1b9b6e00c51af
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
trust: If token path is a file, don't try loading subdirectories
trust/token.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
commit 4bbb7038816d3664c92cb442e3d1ccac8f92f83c
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
trust: Correctly handle persisting OIDs with zero length
trust/persist.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 6f212d25c6e03705d58137a2ffa0ccb59bf944ff
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
trust: Don't write out internal attributes when persisting
trust/Makefile.am | 1 +
trust/index.h | 16 +---------------
trust/persist.c | 7 +++++++
trust/types.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 63 insertions(+), 15 deletions(-)
commit e355c6724c6fb8cd604763ad2518751056512b2b
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
trust: Add support for saving files with unique file names
trust/extract-cer.c | 4 +-
trust/extract-jks.c | 2 +-
trust/extract-openssl.c | 52 ++++++++------
trust/extract-pem.c | 8 ++-
trust/save.c | 171 +++++++++++++++++++++++++++++++++------------
trust/save.h | 6 +-
trust/tests/test-openssl.c | 1 -
trust/tests/test-save.c | 168 +++++++++++++++++++++++++++++++++-----------
8 files changed, 298 insertions(+), 114 deletions(-)
commit 81431ffd8cbf55175b1b9a9ed130fc67d0d4000b
Author: Stef Walter <stef@thewalter.net>
Date: 2013-07-03
path: Add p11_path_canon() function
Cleans up a filename with readable characters.
common/path.c | 15 +++++++++++++++
common/path.h | 2 ++
common/tests/test-path.c | 17 +++++++++++++++++
trust/extract-info.c | 11 ++---------
4 files changed, 36 insertions(+), 9 deletions(-)
commit 1c4522e5df79bd197feab8448008fc2bf6b4ea2e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-28
trust: Rename p11_index_batch() to p11_index_load()
The name makes it clearer what's going on. This is only used
during loading, so we can track whether a change has resulted
from the trust module or from the file storage.
trust/builder.c | 4 ++--
trust/index.c | 4 ++--
trust/index.h | 4 ++--
trust/tests/test-builder.c | 16 ++++++++--------
trust/tests/test-index.c | 12 ++++++------
trust/token.c | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
commit 17bc43cb82320f2aba4ccb804bd8599232524c6a
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-28
trust: Implement reloading of token data
* Reload token data whenever a new session is opened.
* Only reload files/directories that have changed.
* Move duplicate anchor/blacklist detection logic into
the extract code. This is in line with the approach
being discussed on the mailing lists and spec document.
* New internal attribute CKA_X_ORIGIN set on all objects
so we can track where an object came from, and replace
it when reloaded.
In general this is a prerequisite for modification of objects
reload before modify is necessary to prevent multiple callers
clobbering each other's changes.
trust/builder.c | 3 +-
trust/extract-info.c | 86 ++++++++----
trust/index.c | 18 ++-
trust/index.h | 6 +
trust/module.c | 5 +-
trust/parser.c | 124 +++--------------
trust/parser.h | 7 +-
trust/tests/test-extract.c | 28 ++--
trust/tests/test-parser.c | 184 +++++--------------------
trust/tests/test-token.c | 255 ++++++++++++++++++++++++++++++----
trust/tests/test-trust.c | 75 ++++++++++
trust/tests/test-trust.h | 28 ++++
trust/token.c | 331 +++++++++++++++++++++++++++++++++++----------
trust/token.h | 3 +
14 files changed, 746 insertions(+), 407 deletions(-)
commit 7bb9ad33da0154c9a4317f0123046eee85738349
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-28
iter: Add iteration mode where session is not busy
In order to use the session we are iterating on for other tasks
such as other C_FindObject() calls, we need to make sure that
it's not in the middle of a find operation. Finish up the
complete find operation in advance of returning objects from
a session.
Make this the default mode. The previous behavior remains
as an option. Add tests.
p11-kit/iter.c | 59 +++++++++++++++--------
p11-kit/iter.h | 7 ++-
p11-kit/tests/test-iter.c | 111 +++++++++++++++++++++++++++++++++----------
trust/extract-info.c | 8 ++--
trust/extract.c | 2 +-
trust/tests/frob-nss-trust.c | 6 +--
trust/tests/test-bundle.c | 2 +-
trust/tests/test-cer.c | 2 +-
trust/tests/test-extract.c | 2 +-
trust/tests/test-openssl.c | 2 +-
10 files changed, 144 insertions(+), 57 deletions(-)
commit 7eabbee227f09cc4ff9e472520f03bba1e35596b
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-28
path: Add p11_path_prefix() function
Checks if a wellformed path is identical to or a prefix
of another path.
common/path.c | 17 +++++++++++++++++
common/path.h | 3 +++
common/tests/test-path.c | 13 +++++++++++++
3 files changed, 33 insertions(+)
commit 1e777512e554db76ba2f1aba800ee09a9fa074f0
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-26
trust: Implement validation for creating/modifying objects
trust/builder.c | 277 ++++++++++++++++++++++++-----
trust/tests/test-builder.c | 427 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 661 insertions(+), 43 deletions(-)
commit c807b2432bb954caf89f3092b65ea61a1bc6942e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-25
Fix dependency between p11-kit command and library
p11-kit/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6daeaa08d0e7c7f49392cd9e419c74b6c8721811
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-25
Fix running trust module tests under distcheck
trust/tests/test-module.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
commit 069c52a10cc4c4c06de8a4d83ddb3755e40be7a4
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-24
Reorganize various components
* p11-kit library and tool in the p11-kit/ subdirectory
* trust module and new trust tool in trust/ subdirectory
* No more tools/ subdirectory
* Lots less in the common/ subdirectory
.gitignore | 2 +
Makefile.am | 1 -
common/Makefile.am | 31 +--
common/tests/Makefile.am | 32 +--
common/tests/test-lexer.c | 35 +--
{tools => common}/tool.c | 76 +++---
{tools => common}/tool.h | 18 +-
configure.ac | 2 -
doc/manual/Makefile.am | 1 -
gtk-doc.make | 2 +-
p11-kit/Makefile.am | 20 ++
{tools => p11-kit}/list.c | 15 +-
p11-kit/p11-kit.c | 102 ++++++++
tools/Makefile.am | 53 -----
tools/tests/Makefile.am | 84 -------
tools/tests/files/cacert3.der | Bin 1885 -> 0 bytes
tools/tests/files/cacert3.pem | 42 ----
tools/tests/test-tools.c | 216 -----------------
tools/tests/test-tools.h | 260 ---------------------
trust/Makefile.am | 56 ++++-
{common => trust}/asn1.c | 0
{common => trust}/asn1.h | 0
{common => trust}/base64.c | 0
{common => trust}/base64.h | 0
{common => trust}/basic.asn | 0
{common => trust}/basic.asn.h | 0
tools/extract-x509.c => trust/extract-cer.c | 0
{tools => trust}/extract-info.c | 0
{tools => trust}/extract-jks.c | 0
{tools => trust}/extract-openssl.c | 0
{tools => trust}/extract-pem.c | 0
{tools => trust}/extract.c | 4 +-
{tools => trust}/extract.h | 3 +
{common => trust}/oid.c | 0
{common => trust}/oid.h | 0
{common => trust}/openssl.asn | 0
{common => trust}/openssl.asn.h | 0
{common => trust}/pem.c | 0
{common => trust}/pem.h | 0
{common => trust}/pkix.asn | 0
{common => trust}/pkix.asn.h | 0
{tools => trust}/save.c | 0
{tools => trust}/save.h | 0
trust/tests/Makefile.am | 70 +++++-
.../tests/files/cacert3-distrust-all.pem | 0
.../tests/files/cacert3-distrusted-all.pem | 0
.../tests/files/cacert3-not-trusted.pem | 0
.../tests/files/cacert3-trusted-alias.pem | 0
.../tests/files/cacert3-trusted-keyid.pem | 0
.../tests/files/cacert3-trusted-multiple.pem | 0
.../tests/files/cacert3-trusted-server-alias.pem | 0
{tools => trust}/tests/files/cacert3-twice.pem | 0
{tools => trust}/tests/files/empty-file | 0
{tools => trust}/tests/files/simple-string | 0
{common => trust}/tests/frob-cert.c | 0
{common => trust}/tests/frob-eku.c | 0
{common => trust}/tests/frob-ku.c | 0
{common => trust}/tests/frob-oid.c | 0
{common => trust}/tests/test-asn1.c | 0
{common => trust}/tests/test-base64.c | 0
.../tests/test-pem.c => trust/tests/test-bundle.c | 5 +-
tools/tests/test-x509.c => trust/tests/test-cer.c | 5 +-
{tools => trust}/tests/test-extract.c | 5 +-
{common => trust}/tests/test-oid.c | 0
{tools => trust}/tests/test-openssl.c | 5 +-
{common => trust}/tests/test-pem.c | 0
{tools => trust}/tests/test-save.c | 5 +-
trust/tests/test-trust.c | 176 +++++++++++++-
trust/tests/test-trust.h | 74 ++++++
{common => trust}/tests/test-utf8.c | 0
{common => trust}/tests/test-x509.c | 0
trust/trust.c | 64 +++++
{common => trust}/utf8.c | 0
{common => trust}/utf8.h | 0
{common => trust}/x509.c | 0
{common => trust}/x509.h | 0
76 files changed, 638 insertions(+), 826 deletions(-)
commit 5489a1456c5a6f320bd2b3aa849f36f10d538e81
Merge: 1caa880 93f1977
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-17
Merge branch 'stable'
commit 1caa8801f6d888befb3515d24171bf77a172a93c
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-14
trust: Writable module PKCS#11 token functions
Although we don't actually write anything out yet, make the
various PKCS#11 functions behave properly when faced with
requests to write to token objects
common/test.c | 14 ++++++--
trust/module.c | 88 ++++++++++++++++++++++++++++++++++++-----------
trust/session.h | 1 +
trust/tests/test-module.c | 38 ++++++++++++++++----
4 files changed, 111 insertions(+), 30 deletions(-)
commit 93f197792150ae2e2e3ffafb903dfab6854915cb
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-17
trust: Move the extract-trust external placeholder command into trust/
.gitignore | 3 ++-
configure.ac | 2 +-
tools/Makefile.am | 4 ----
trust/Makefile.am | 4 ++++
{tools => trust}/p11-kit-extract-trust.in | 0
5 files changed, 7 insertions(+), 6 deletions(-)
commit 41d2a28b89af41799d01d5973d026712d9174f31
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-17
trust: Print out usage when extract-trust run incorrectly
Also sorta covers --help and -h usage
tools/p11-kit-extract-trust.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit e32481727387460d5900d0bbb495d3694facf64b
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-17
tools: Fix passing args to external commands
There were various bugs passing arguments, with duplicates being
passed, as well as certain arguments being skipped.t
tools/tool.c | 4 ++++
1 file changed, 4 insertions(+)
commit b6e065cda1db37a6c8ed52dac3432468e1277323
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-17
tools: Only use our private path when looking for external commands
Instead of looking for external commands in the path, just look
for them in our private directory.
We want to be conservative early on, and limit what sorta things
we have to maintain later. We can later remove this restriction
if a real use case presents itself.
tools/tool.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
commit bfe10cd0660fd81d78c8c5ce3eaa7d1f046859e1
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-14
trust: Correctly reflect the CK_TOKEN_INFO writability flags
Correctly set the CKF_TOKEN_WRITE_PROTECTED flag for paths
which we will be able to write to.
common/compat.h | 3 ++
trust/module.c | 5 +++-
trust/tests/test-module.c | 57 +++++++++++++++++++++++++++++++++--
trust/tests/test-token.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 47 +++++++++++++++++++++++++++++
trust/token.h | 2 ++
6 files changed, 187 insertions(+), 3 deletions(-)
commit 045df29606ea9853b4fc8bdba062a5e4a7a5be95
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-14
path: Add p11_path_parent() function
Gets the parent element of the path, removing the last component.
Handles trailing and duplicate path separators correctly.
common/path.c | 36 ++++++++++++++++++++++++++++++++++++
common/path.h | 2 ++
common/tests/test-path.c | 17 +++++++++++++++++
3 files changed, 55 insertions(+)
commit 8c6dd48789bdaf2a3dc800df7ed3416ddc3b7e1f
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-14
path: Fix expanding of paths and tests
common/path.c | 16 +++++++++++-----
common/tests/test-path.c | 46 ++++++++++++++++++++++++++--------------------
2 files changed, 37 insertions(+), 25 deletions(-)
commit 9e03e9950d78b58a91454b494513d1fc0872dcf2
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-13
common: Abort test cases when one fails
common/test.c | 2 ++
1 file changed, 2 insertions(+)
commit 125aa8b136fa950172c3946ca4768cf4750b697a
Merge: f48e1a2 49e344c
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-05
Merge branch 'stable'
commit 49e344cfa48d765ccc83a7313b1ba1c30252b84e
Author: Stef Walter <stef@thewalter.net>
Date: 2013-06-05
Release version 0.18.3
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 1b61494bb10866841e52956a2b65b75259f64e3c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-06-05
trust: Fix crash when C_Initialize args are NULL
https://bugs.freedesktop.org/show_bug.cgi?id=65401
trust/module.c | 5 ++++-
trust/tests/test-module.c | 18 ++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
commit 3dc38f294af5bbe1939d38ec9b3fcd699f97c8ce
Author: Stef Walter <stefw@gnome.org>
Date: 2013-06-05
trust: Fix reinitialization of trust module
Track number of C_Initialize calls, and require similar number
of C_Finalize calls to finalize.
This fixes leaks/disappearing sessions in the trust module.
https://bugs.freedesktop.org/show_bug.cgi?id=65401
trust/module.c | 25 +++++++++++++---
trust/tests/frob-multi-init.c | 69 +++++++++++++++++++++++++++++++++++++++++++
trust/tests/test-module.c | 49 ++++++++++++++++++++++++++++++
3 files changed, 139 insertions(+), 4 deletions(-)
commit f48e1a2a496604a835d0f9230113218951a1ced2
Author: manphiz@gmail.com <manphiz@gmail.com>
Date: 2013-04-24
Fix uninitialized p11_library_once
https://bugs.freedesktop.org/show_bug.cgi?id=57714
common/library.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6132376b31f6d8c27fa63b219e7330f4489de6cc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-05
Force Mac OS shared library extension to .so
Darwin and libtool seem confused about what shared library
extension they actually use.
https://bugs.freedesktop.org/show_bug.cgi?id=57714
configure.ac | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit cf91dc6975424e3ba3971e4496e91036e97419e5
Author: manphiz@gmail.com <manphiz@gmail.com>
Date: 2013-04-24
Fix uninitialized p11_library_once
https://bugs.freedesktop.org/show_bug.cgi?id=57714
common/library.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f358242f0068b280c1478075617288095dd95adc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-05
Force Mac OS shared library extension to .so
Darwin and libtool seem confused about what shared library
extension they actually use.
https://bugs.freedesktop.org/show_bug.cgi?id=57714
configure.ac | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
commit 96771f49dc945800ae28c77ff407753cbb995c7f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
persist: Support for writing out p11-kit persist files
trust/parser.c | 10 +-
trust/persist.c | 458 +++++++++++++++++++++++++++++++++++++++------
trust/persist.h | 4 +
trust/tests/test-persist.c | 203 +++++++++++++++++---
trust/tests/test-trust.c | 2 +-
5 files changed, 587 insertions(+), 90 deletions(-)
commit daf63f2cf66669b3555f2f15498a0aa2db234b2f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
constants: Tweaks and add mechanisms
common/constants.c | 428 +++++++++++++++++++++---------------------
common/tests/test-constants.c | 70 +++----
2 files changed, 245 insertions(+), 253 deletions(-)
commit 56fec770071713bf800e7e9f3905973703105ec5
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
pem: Write PEM data directly to a buffer
common/pem.c | 38 +++++++++++++++++---------------------
common/pem.h | 7 +++++--
common/tests/test-pem.c | 21 ++++++++++++---------
tools/extract-openssl.c | 29 +++++++++++++++++------------
tools/extract-pem.c | 32 ++++++++++++++++++++------------
5 files changed, 71 insertions(+), 56 deletions(-)
commit cb8f2e3a04d9365121ffea0d76d8b3d47e2cc1ec
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
url: Encode directly to a buffer
common/tests/test-url.c | 30 ++++++++++++++++++------------
common/url.c | 29 ++++++++++-------------------
common/url.h | 5 +++--
p11-kit/uri.c | 32 +++++++++++++++++++-------------
4 files changed, 50 insertions(+), 46 deletions(-)
commit 4fd057258177f4f14bbe78c2d02d5a65eaf3f3dc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-27
Release version 0.19.1
NEWS | 11 +++++++++++
configure.ac | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
commit e98522ba9e92be79526eba9daee9f60aa30ad942
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
Mark p11_kit_message() as a stable function
doc/manual/p11-kit-sections.txt | 2 +-
p11-kit/p11-kit.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 61a9cfa62972678f1cbbad7f4d1a814e9b7f05e2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
Fix building of applications using CRYPTOKI_GNU style
p11-kit/p11-kit.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 435843812ab7b85f97cfdc32ae9412f78242b950
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
Bump the version for deprecated function documentation
p11-kit/modules.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
commit 30830eb693ac2e89f28bb34459db6837031ca795
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-09
Fix up Makefile.am files for automake 1.13 warnings
common/tests/Makefile.am | 4 ++--
p11-kit/Makefile.am | 2 +-
p11-kit/tests/Makefile.am | 2 +-
tools/Makefile.am | 2 +-
tools/tests/Makefile.am | 2 +-
trust/Makefile.am | 2 +-
trust/tests/Makefile.am | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
commit dcabaf1d56d410ba7ddb3dfbab9011bbbea5e6bc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-05
Our own unit testing framework
* Support the TAP protocol
* Much cleaner without having to carry around state
* First class support for setup/teardown
* Port the common tests
* Wait on porting other tests until we've merged outstanding code
build/Makefile.am | 8 -
build/Makefile.tests | 5 +-
build/cutest/CuTest.c | 329 -------
build/cutest/CuTest.h | 111 ---
build/cutest/README.txt | 211 ----
build/cutest/license.txt | 38 -
common/Makefile.am | 5 +-
common/debug.h | 2 +
common/test.c | 261 +++++
common/test.h | 131 +++
common/tests/Makefile.am | 3 +-
common/tests/test-array.c | 101 +-
common/tests/test-asn1.c | 53 +-
common/tests/test-attrs.c | 461 +++++----
common/tests/test-base64.c | 67 +-
common/tests/test-buffer.c | 113 +--
common/tests/test-compat.c | 28 +-
common/tests/test-constants.c | 45 +-
common/tests/test-dict.c | 250 +++--
common/tests/test-hash.c | 74 +-
common/tests/test-lexer.c | 126 ++-
common/tests/test-oid.c | 45 +-
common/tests/test-path.c | 68 +-
common/tests/test-pem.c | 76 +-
common/tests/test-url.c | 93 +-
common/tests/test-utf8.c | 60 +-
common/tests/test-x509.c | 106 +-
p11-kit/tests/Makefile.am | 14 +-
p11-kit/tests/{conf-test.c => test-conf.c} | 252 +++--
p11-kit/tests/test-deprecated.c | 187 ++--
p11-kit/tests/test-init.c | 144 ++-
p11-kit/tests/test-iter.c | 481 +++++-----
p11-kit/tests/test-log.c | 41 +-
p11-kit/tests/test-managed.c | 97 +-
p11-kit/tests/test-mock.c | 1012 ++++++++++----------
p11-kit/tests/test-modules.c | 157 ++-
p11-kit/tests/{pin-test.c => test-pin.c} | 104 +-
p11-kit/tests/{progname-test.c => test-progname.c} | 34 +-
p11-kit/tests/test-proxy.c | 75 +-
p11-kit/tests/{uri-test.c => test-uri.c} | 633 ++++++------
p11-kit/tests/test-virtual.c | 70 +-
tools/tests/Makefile.am | 6 +-
tools/tests/test-extract.c | 221 ++---
tools/tests/test-openssl.c | 186 ++--
tools/tests/test-pem.c | 96 +-
tools/tests/test-save.c | 329 +++----
tools/tests/{test.c => test-tools.c} | 65 +-
tools/tests/{test.h => test-tools.h} | 34 +-
tools/tests/test-x509.c | 102 +-
trust/tests/Makefile.am | 5 +-
trust/tests/test-builder.c | 446 +++------
trust/tests/test-index.c | 395 ++++----
trust/tests/test-module.c | 470 ++++-----
trust/tests/test-parser.c | 219 ++---
trust/tests/test-persist.c | 155 ++-
trust/tests/test-token.c | 93 +-
trust/tests/{test-data.c => test-trust.c} | 56 +-
trust/tests/{test-data.h => test-trust.h} | 40 +-
58 files changed, 3901 insertions(+), 5188 deletions(-)
commit 7fd6d89d92b6f1b543bf2aa4b2e578201dad7147
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-06
Further reorganization of the core module tracking
* Keep the module ownership apart from the tracking of module
function pointers, since these are only relevant for unmanaged
modules.
* Less assumptions that each module has a raw unmanaged module
function pointer.
* More clarity in the naming of dictionaries tracking the modules.
p11-kit/modules.c | 349 +++++++++++++++++++++++++-----------------------------
1 file changed, 161 insertions(+), 188 deletions(-)
commit eb88be6c0b7ea39a74cd2aa8af33371de4aeb74c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-07
Pull the argv parsing code into its own file
So it can be used from multiple code paths
common/Makefile.am | 1 +
common/argv.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++
common/argv.h | 44 ++++++++++++++++++++
trust/module.c | 78 ++----------------------------------
4 files changed, 164 insertions(+), 74 deletions(-)
commit 7b848defc704cc1fbb47a16b23727583c14b804d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-06
Support /xxx/yyy as an absolute path with Win32
Because win32 code doesn't just run on windows, wine runs
with unix style paths.
common/path.c | 8 ++++----
common/tests/test-path.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
commit 10d26767fa39f43b0aabb82d73ed88b2c2522397
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-21
Bump the version number to unstable
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b73f4ef126bdead47262e29e47d159a89984d65f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-19
Add the log-calls module config option
If 'log-calls = yes' is set then all the PKCS#11 modules are logged
to stderr.
common/attrs.c | 22 +-
common/attrs.h | 9 +
common/constants.c | 350 ++++++-
common/constants.h | 8 +
common/tests/test-constants.c | 18 +-
doc/manual/Makefile.am | 1 +
doc/manual/p11-kit-sharing.xml | 5 +
doc/manual/pkcs11.conf.xml | 19 +
p11-kit/Makefile.am | 1 +
p11-kit/log.c | 2022 ++++++++++++++++++++++++++++++++++++++++
p11-kit/log.h | 53 ++
p11-kit/modules.c | 44 +-
p11-kit/tests/Makefile.am | 1 +
p11-kit/tests/test-log.c | 125 +++
p11-kit/tests/test-mock.c | 4 +-
15 files changed, 2646 insertions(+), 36 deletions(-)
commit a14ff781ebf231daa99990fd65c2312f26db93a8
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-19
Manage C_CloseAllSessions function for multiple callers
Make C_CloseAllSessions work for different callers. Track the sessions
that each caller opens and close just those when C_CloseAllSessiosn is
called.
common/mock.c | 2 +-
doc/manual/p11-kit-sharing.xml | 6 ++
p11-kit/modules.c | 202 ++++++++++++++++++++++++++++++++++++++++-
p11-kit/tests/test-init.c | 9 +-
p11-kit/tests/test-managed.c | 64 ++++++++++++-
5 files changed, 275 insertions(+), 8 deletions(-)
commit 0cb1132469c1e13be64f85cd6566e6617bfe32cc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-15
Update the proxy module to use managed PKCS#11 modules
Each time C_GetFunctionList is called on the proxy module, a new
managed PKCS#11 set of functions is returned. These are all cleaned
up when the module is unloaded.
We want the proxy module to continue to work even without the highly
recommended libffi. For that reason we still keep the old behavior of
sharing state in the proxy module.
common/mock.c | 9 -
common/mock.h | 11 +
doc/manual/Makefile.am | 1 +
p11-kit/Makefile.am | 2 +-
p11-kit/modules.c | 5 +-
p11-kit/private.h | 4 -
p11-kit/proxy.c | 1465 +++++++++++++++++++++++++++++++++++++-------
p11-kit/proxy.h | 45 ++
p11-kit/tests/test-mock.c | 26 +-
p11-kit/tests/test-proxy.c | 116 +++-
p11-kit/util.c | 3 +
11 files changed, 1422 insertions(+), 265 deletions(-)
commit 5c19f0cf66495f00ccf69eba1d0915f862a88c8d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-06
p11-kit: Managed PKCS#11 module loading
Support a new managed style module loading for PKCS#11 modules. This
allows us to better coordinate between multiple callers of the same
PKCS#11 modules and provide hooks into their behavior.
This meant redoing the public facing API. The old methods are now
deprecated, marked and documented as such.
common/compat.c | 6 +
common/compat.h | 4 +-
common/mock.c | 63 +-
common/mock.h | 6 +-
doc/manual/Makefile.am | 2 +
doc/manual/p11-kit-docs.xml | 2 +
doc/manual/p11-kit-proxy.xml | 29 +
doc/manual/p11-kit-sections.txt | 39 +-
doc/manual/p11-kit-sharing.xml | 94 +-
doc/manual/pkcs11.conf.xml | 24 +
gtk-doc.make | 2 +-
p11-kit/Makefile.am | 7 +-
p11-kit/deprecated.h | 97 ++
p11-kit/docs.h | 38 +
p11-kit/modules.c | 1498 ++++++++++++++++++++----
p11-kit/modules.h | 51 +
p11-kit/p11-kit.h | 63 +-
p11-kit/private.h | 6 -
p11-kit/proxy.c | 231 ++--
p11-kit/tests/Makefile.am | 10 +-
p11-kit/tests/files/system-pkcs11.conf | 5 +-
p11-kit/tests/files/user-modules/one.module | 3 +-
p11-kit/tests/test-deprecated.c | 521 +++++++++
p11-kit/tests/test-init.c | 176 ++-
p11-kit/tests/test-iter.c | 72 +-
p11-kit/tests/test-managed.c | 168 +++
p11-kit/tests/test-mock.c | 1687 +++++++++++++++++++++++++++
p11-kit/tests/test-modules.c | 124 +-
p11-kit/tests/test-proxy.c | 94 ++
tools/extract.c | 15 +-
tools/list.c | 16 +-
tools/tests/test-extract.c | 7 +-
tools/tests/test-openssl.c | 9 +-
tools/tests/test-pem.c | 9 +-
tools/tests/test-x509.c | 9 +-
trust/tests/frob-nss-trust.c | 25 +-
36 files changed, 4660 insertions(+), 552 deletions(-)
commit ff853bd7902e271256cada4a1b20a3d46b519b69
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-10
Use libffi to implement mixins for managed code
* This allows us to call into subclassed PKCS#11 modules as if
they were plain old PKCS#11 modules
* libffi is an optional dependency
configure.ac | 31 +
doc/manual/Makefile.am | 5 +-
doc/manual/p11-kit-devel.xml | 3 +
p11-kit/Makefile.am | 7 +-
p11-kit/tests/Makefile.am | 7 +
p11-kit/tests/test-virtual.c | 183 +++
p11-kit/virtual.c | 2964 ++++++++++++++++++++++++++++++++++++++++++
p11-kit/virtual.h | 68 +
8 files changed, 3265 insertions(+), 3 deletions(-)
commit a7af75a31010109529a9edddc825538884f326ca
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-14
Add subclassable CK_X_FUNCTION_LIST
One of the flaws in PKCS#11 for our usage is that each PKCS#11 module
is not passed the pointer to the function list, ie: the vtable
Here we define a new function list vtable, where each PKCS#11 function
takes the vtable itself as the first argument. We use this new
list internally to represent subclassable PKCS#11 modules for
various features.
common/mock.c | 757 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
common/mock.h | 370 ++++++++++++++++++++++++++-
common/pkcs11x.h | 438 ++++++++++++++++++++++++++++++++
3 files changed, 1561 insertions(+), 4 deletions(-)
commit 06a84bafc7c5f0ac92883e9219a7c00f456df39c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-15
Fail early when running automaint.sh
automaint.sh | 2 ++
1 file changed, 2 insertions(+)
commit de8b99e2f04f94313a7748adedf7535603013951
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-15
Implement valgrind's hellgrind checks for threading problems
And cleanup our locks/locking model. There's no need to use
recursive locks, especially since we can't use them on all
platforms. In addition adjust taking of locks during initialization
so that there's no chance of deadlocking here.
automaint.sh | 2 +-
build/Makefile.decl | 5 +++++
build/Makefile.tests | 5 +++++
common/compat.c | 2 +-
p11-kit/modules.c | 2 +-
5 files changed, 13 insertions(+), 3 deletions(-)
commit 4bd7eda265b94dfcb9a1db4aba756e1e05dd4f87
Author: Stef Walter <stefw@gnome.org>
Date: 2013-05-14
Release version 0.18.2
NEWS | 3 +++
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit c6793097e6f0d82cfca07aaeb55c7e9b742d2fdf
Author: manphiz@gmail.com <manphiz@gmail.com>
Date: 2013-05-09
Patch to make test-lexer depend on ASN.1
https://bugs.freedesktop.org/show_bug.cgi?id=64378
common/tests/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e72df3c2546a79f51e7c203bc5735494d45c5c26
Author: Stef Walter <stefw@redhat.com>
Date: 2013-05-03
Reduce libtasn1 dependency to 2.3
* This passes all checks and is compatible
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 32e26b5c1852fd7b0261929e3a9b39c473621fd2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-15
Release version 0.18.1
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit d4392aef7fa3a3b2c308ad3d05c691569361ee49
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
doc: Use gtk-doc in the no-tmpl flavor
doc/manual/Makefile.am | 6 ++++++
gtk-doc.make | 39 +++++++++------------------------------
2 files changed, 15 insertions(+), 30 deletions(-)
commit 153dc7a750a11d7940f4e4e6e718939d23ee4541
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
manual: Use a consistent docbook version
doc/manual/p11-kit-config.xml | 5 +++--
doc/manual/p11-kit-devel.xml | 5 +++--
doc/manual/p11-kit-sharing.xml | 5 +++--
doc/manual/p11-kit-trust.xml | 5 +++--
doc/manual/p11-kit.xml | 4 ++--
doc/manual/pkcs11.conf.xml | 4 ++--
6 files changed, 16 insertions(+), 12 deletions(-)
commit 3e5916530b995bda1a5deea7ecf9c185a402d463
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
Put the external tools in $libdir/p11-kit
These are possibly architecture specific binaries, so they should be
in $libdir/p11-kit and not in $datadir/p11-kit
configure.ac | 3 +++
tools/Makefile.am | 4 ++--
tools/tool.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
commit 941ff24161e040fca7382e3f98b0c1b51da21dac
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
Release version 0.18.0
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 32b0b448d0ac4f1fa5f9143f0c4385066a9b4a76
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
Fix off by one in date parsing code
We didn't treat the two digit year 00 as a valid year, whereas it
actually represents the year 2000. This is in a non-critical code path.
trust/builder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d6e0982658acb231333ebfbfb7efff8b762231d0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-04
Don't print erroneous debug messages when skipping files
The parser automatically skips over files that it cannot parse. Don't
print confusing debug messages about DER parse failures when it does so.
common/asn1.c | 12 ++++++------
trust/parser.c | 8 +++++---
2 files changed, 11 insertions(+), 9 deletions(-)
commit 032fbd8806333bdaf0201cfd9d7bcaac8ec75184
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-02
Update to MurmurHash3
This should also fix problems with accessing memory in a non-aligned
fashion on platforms where this causes problems.
https://bugs.freedesktop.org/show_bug.cgi?id=62819
common/attrs.c | 2 +-
common/dict.c | 2 +-
common/hash.c | 149 +++++++++++++++++++++++++----------------------
common/hash.h | 4 +-
common/tests/test-hash.c | 18 +++---
5 files changed, 91 insertions(+), 84 deletions(-)
commit 8c69e467527c5ee484c9a921e9b5fd18c0c49b12
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-29
Don't respect timezones for CKA_START_DATE or CKA_END_DATE
The PKCS#11 specification does not note what timezone these dates
are in. In addition the time values are not represented in PKCS#11.
So don't reinterpret certificate dates, other than filling in the
century for dates that have a two digit year.
Lastly, these are low resolution optional fields so not being all
strict about timezones here is appropriate.
https://bugs.freedesktop.org/show_bug.cgi?id=62825
common/asn1.c | 332 ---------------------------------------------
common/asn1.h | 6 -
trust/builder.c | 100 +++++++++++---
trust/tests/test-builder.c | 14 +-
4 files changed, 81 insertions(+), 371 deletions(-)
commit 91aa0f9623e232fa253308c4f7464dab8902dfea
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-29
trust: Fix logic for matching invalid NSS serial numbers
Sometimes NSS queries for trust objects using invalid serial numbers
that do not have their DER decoding. We fixed this earlier, but want
to make sure there are no corner cases, accidentally not matching
serial numbers that happen to start with the same bytes as a DER
TLV would.
trust/module.c | 120 ++++++++++++++++++++++++++++------------------
trust/tests/test-module.c | 107 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 180 insertions(+), 47 deletions(-)
commit a63311a0f3f2669138d09ff8f618fd4d12fa0c3d
Author: Stef Walter <stefw@redhat.com>
Date: 2013-04-03
More compatible path munging and handling code
Centralize the path handling code, so we can remove unixy assumptions
and have a chance of running on Windows. The current goal is to run
all the tests on Windows.
Includes some code from LRN <lrn1986@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=63062
common/Makefile.am | 1 +
common/compat.c | 34 ------
common/compat.h | 9 +-
common/path.c | 258 +++++++++++++++++++++++++++++++++++++++++++++
common/path.h | 62 +++++++++++
common/tests/Makefile.am | 1 +
common/tests/test-compat.c | 32 ------
common/tests/test-path.c | 202 +++++++++++++++++++++++++++++++++++
p11-kit/conf.c | 60 +----------
p11-kit/modules.c | 38 +------
tools/tests/test-openssl.c | 3 +-
tools/tests/test-pem.c | 3 +-
tools/tests/test-save.c | 3 +-
tools/tests/test-x509.c | 3 +-
tools/tool.c | 3 +-
trust/module.c | 5 +-
trust/parser.c | 3 +-
trust/tests/test-module.c | 10 +-
trust/token.c | 3 +-
19 files changed, 558 insertions(+), 175 deletions(-)
commit c3f1b0a45eb1c28b6f025f8ae56c3b020801b6aa
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-03
Don't use free() on memory allocated by LocalFree()
ihttps://bugs.freedesktop.org/show_bug.cgi?id=63046
common/library.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit fcc3a83cc4d540bc2c4096524b5e8003046ba561
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-02
Separate library init from message code
Put library init/uninit code its into their own statically
linked library so that they don't get linked into the p11-kit
executable.
Refactor the message code so that the library initialization can
plug in its per thread message buffer.
https://bugs.freedesktop.org/show_bug.cgi?id=63046
common/Makefile.am | 15 ++---
common/lexer.c | 2 +-
common/library.c | 85 +++++---------------------
common/library.h | 14 -----
common/message.c | 140 +++++++++++++++++++++++++++++++++++++++++++
common/message.h | 62 +++++++++++++++++++
common/mock.c | 2 +-
common/tests/Makefile.am | 3 +-
common/tests/test-base64.c | 5 +-
common/tests/test-lexer.c | 3 +-
common/tests/test-url.c | 5 +-
p11-kit/Makefile.am | 2 +-
p11-kit/conf.c | 2 +-
p11-kit/modules.c | 1 +
p11-kit/pin.c | 1 +
p11-kit/proxy.c | 1 +
p11-kit/tests/Makefile.am | 6 +-
p11-kit/tests/conf-test.c | 31 +++++-----
p11-kit/tests/test-iter.c | 1 +
p11-kit/tests/test-modules.c | 1 +
p11-kit/tests/uri-test.c | 5 +-
p11-kit/uri.c | 2 +-
p11-kit/util.c | 1 +
tools/Makefile.am | 3 +-
tools/extract-info.c | 2 +-
tools/extract-jks.c | 2 +-
tools/extract-openssl.c | 2 +-
tools/extract-pem.c | 2 +-
tools/extract-x509.c | 2 +-
tools/extract.c | 2 +-
tools/list.c | 2 +-
tools/save.c | 2 +-
tools/tests/Makefile.am | 3 +-
tools/tests/test-extract.c | 3 +-
tools/tests/test-openssl.c | 3 +-
tools/tests/test-pem.c | 3 +-
tools/tests/test-save.c | 5 +-
tools/tests/test-x509.c | 3 +-
tools/tool.c | 2 +-
trust/Makefile.am | 2 +-
trust/builder.c | 2 +-
trust/module.c | 1 +
trust/parser.c | 2 +-
trust/session.c | 2 +-
trust/tests/Makefile.am | 5 +-
trust/tests/test-builder.c | 3 +-
trust/tests/test-index.c | 3 +-
trust/tests/test-module.c | 2 -
trust/tests/test-parser.c | 3 +-
trust/tests/test-persist.c | 3 +-
trust/tests/test-token.c | 3 +-
trust/token.c | 2 +-
52 files changed, 294 insertions(+), 170 deletions(-)
commit ae7dd1be6d431f25b101bc7e2b3fa373a8cbb47b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-02
Don't use library locks from p11-kit tool
The global library p11_library_mutex is for libraries to use, so don't
use it from any code in common/, which is also used by the p11-kit tool
https://bugs.freedesktop.org/show_bug.cgi?id=63046
common/library.c | 4 ----
p11-kit/util.c | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
commit 2e8f586cd5a0c4cf2471c085e9e0e4fdcc04d996
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-03
Add new script for setting up p11-kit for a maintainer
Add win32 cross build, and build out of tree
.gitignore | 6 ++++++
automaint.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
commit b7ccd06e1f969a6b86285360234582fe01d3aeaf
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-03
Fix build on Win32
Don't reference an undefined macro
https://bugs.freedesktop.org/show_bug.cgi?id=63046
tools/tests/test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bd6e31c485cd84746f474a64a63c15a7ea87d650
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-03
Fix documentation so it builds out of tree
doc/manual/Makefile.am | 7 +-
doc/manual/{p11-kit-docs.sgml => p11-kit-docs.xml} | 0
gtk-doc.make | 189 +++++++++++++--------
3 files changed, 123 insertions(+), 73 deletions(-)
commit e67c0e4465607560e0f6af9e9b0395a9ee78adbc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-04-02
Fix build with automake 1.13
Also remove some generated files from the po/ directory.
.gitignore | 5 +
common/tests/Makefile.am | 4 +-
p11-kit/tests/Makefile.am | 2 +-
po/Makefile.in.in | 444 ----------------------------------------------
po/Rules-quot | 47 -----
tools/tests/Makefile.am | 2 +-
trust/tests/Makefile.am | 2 +-
7 files changed, 10 insertions(+), 496 deletions(-)
commit c3c18a1ea9cd84ee35783809c059d1b9c80c5cbe
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-29
Use CKA_X_CERTIFICATE_VALUE for trust assertions
These don't contain the CKA_VALUE attribute for certificate data
but rather the CKA_X_CERTIFICATE_VALUE attribute.
https://bugs.freedesktop.org/show_bug.cgi?id=62896
trust/builder.c | 15 ++++++++++-----
trust/tests/test-builder.c | 6 +++---
2 files changed, 13 insertions(+), 8 deletions(-)
commit 4560373c254473990306c13178b959ccc5d338e4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-28
Don't complain when applications call C_Logout or C_Login
Some callers erroneously call our C_Logout function, like NSS.
So return appropriate error codes in these cases.
https://bugs.freedesktop.org/show_bug.cgi?id=62874
trust/module.c | 32 ++++++++++++++++++++++++++++++--
trust/tests/test-module.c | 23 +++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
commit 10d8e6d1836701e311d2b55e116909198932915b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-28
Release version 0.17.5
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 87a0afed5db7e916a6ad6715e14996b2e25641d7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-27
Don't try to guess at overflowing time values on 32-bit systems
Since CKA_START_DATE and CKA_END_DATE are the only places
where we want to parse out times, and these are optional, just
leave blank if the time overflows what libc can handle on
a 32-bit system.
https://bugs.freedesktop.org/show_bug.cgi?id=62825
build/certs/Makefile.am | 3 ++
build/certs/distant-end-date.der | Bin 0 -> 366 bytes
common/asn1.c | 6 ++--
trust/builder.c | 5 +--
trust/tests/test-builder.c | 71 +++++++++++++++++++++++++++++++++++++++
5 files changed, 80 insertions(+), 5 deletions(-)
commit b0e44f8e1e589726c95506da5121e95a54269fd7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-25
Fix testing of murmur hash on bigendian systems
The murmur hash produces different output depending on the architecture
https://bugzilla.redhat.com/show_bug.cgi?id=927394
common/tests/test-hash.c | 60 +++++++++++++++++++-----------------------------
1 file changed, 23 insertions(+), 37 deletions(-)
commit 3f74a3b32ce42cc7e38bdbf8349f976000c3af4c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
Release 0.17.4
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 4b09d2b4d3958b58b020c1ae21fcd932e1eb6c37
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
Fix memory leaks reported by 'make leakcheck'
common/mock.c | 4 +++-
common/pem.c | 1 +
common/tests/test-hash.c | 2 ++
common/tests/test-utf8.c | 4 ++++
common/tests/test-x509.c | 1 +
p11-kit/iter.c | 3 +++
p11-kit/tests/pin-test.c | 1 -
p11-kit/tests/test-iter.c | 1 +
p11-kit/tests/test-modules.c | 2 ++
p11-kit/uri.c | 5 +----
tools/extract-openssl.c | 3 ---
tools/tests/test-openssl.c | 7 ++++++
tools/tests/test-pem.c | 6 +++---
tools/tests/test-save.c | 2 ++
tools/tests/test-x509.c | 3 +++
trust/builder.c | 2 ++
trust/index.c | 7 +++---
trust/module.c | 5 +++--
trust/session.c | 1 +
trust/tests/test-builder.c | 51 +++++++++++++++++++++++++++++++++++---------
trust/tests/test-index.c | 5 +++++
trust/tests/test-module.c | 2 ++
22 files changed, 91 insertions(+), 27 deletions(-)
commit 57d8f36a6cfbde5a9a783f11f2b75f19005c23e1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
Fix invalid memory accesses reported by 'make memcheck'
These are things that showed up in valgrind while running the tests.
common/compat.c | 11 ++++-------
common/tests/test-compat.c | 16 ++++++++++++++++
common/tests/test-hash.c | 22 +++++++++++-----------
trust/index.c | 2 +-
trust/tests/test-index.c | 2 ++
5 files changed, 34 insertions(+), 19 deletions(-)
commit 9cf89e4b43e5e018bb3103be1873a3993769ce4a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
Add a bit of infrastructure for running valgrind
* make memcheck: Runs basic memory checking
* make leakcheck: Also runs leak checking
Makefile.am | 2 ++
build/Makefile.am | 4 ++++
build/Makefile.decl | 11 +++++++++++
build/Makefile.tests | 11 +++++++++++
common/Makefile.am | 3 ++-
common/tests/Makefile.am | 2 --
doc/Makefile.am | 4 ++++
doc/manual/p11-kit-devel.xml | 4 ++++
p11-kit/Makefile.am | 3 ++-
tools/Makefile.am | 3 ++-
tools/tests/Makefile.am | 4 ++--
trust/Makefile.am | 3 ++-
trust/tests/Makefile.am | 2 --
13 files changed, 46 insertions(+), 10 deletions(-)
commit 0ecabc858dd6c1c2055f53202a01251e2ad7d2c2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
trust: Predictable behavior with duplicate certificates in token
If duplicate certificates are present in a token, we warn about this,
and don't really recommend it. However we have predictable behavior
where blacklist is prefered to anchor is preferred to unknown trust.
https://bugs.freedesktop.org/show_bug.cgi?id=62548
trust/parser.c | 94 +++++++++++++++++++++++++++++++++-
trust/tests/test-parser.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++
trust/token.c | 19 ++-----
3 files changed, 224 insertions(+), 16 deletions(-)
commit e075585ef1cffc988894b4efbf3d14d5e55dcdcc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
trust: Rework index to be faster and more usable
The index now uses a sort of cross between a hash table and a bloom
filter internally to select matching items. This is needed for the
massive amount of lookups we want to do during loading.
In addition make p11_index_find() and p11_index_replace() easier
to use.
trust/builder.c | 14 +-
trust/index.c | 439 ++++++++++++++++++++++++++++++++-------------
trust/index.h | 15 +-
trust/tests/Makefile.am | 3 +-
trust/tests/frob-pow.c | 57 ++++++
trust/tests/test-builder.c | 44 ++---
trust/tests/test-index.c | 36 ++--
trust/tests/test-parser.c | 6 +-
trust/tests/test-token.c | 2 +-
9 files changed, 437 insertions(+), 179 deletions(-)
commit fc562261c6bbb35dfed585a78fdec9a408b981c7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
attrs: Print out the CKA_VALUE for certificates when debugging
While it's true that we shouldn't be pritning out CKA_VALUE in
certain cases, like for keys, we obviously can do so for certificates.
We don't have keys anyway, but in the interest of being general
purpose use the class to determine whether CKA_VALUE can be printed
common/attrs.c | 49 ++++++++++++++++++++++++++++++++++++++---------
common/attrs.h | 14 ++++++++++----
common/tests/test-attrs.c | 2 +-
trust/tests/test-data.c | 15 ++++++++++-----
trust/tests/test-data.h | 3 ++-
5 files changed, 63 insertions(+), 20 deletions(-)
commit f45942a4fc3e1c5219e9b5201b82203337ee7280
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
hash: Add the murmur2 hash and start using it
Add implementation of the murmur2 hash function, and start using
it for our dictionaries. Our implementation is incremental
like our other hash functions.
Also remove p11_oid_hash() which wasn't being used.
In addition fix several tests whose success was based on the
way that the dictionary hashed. This was a hidden testing bug.
build/certs/Makefile.am | 6 +-
common/attrs.c | 11 +-
common/dict.c | 11 +-
common/hash.c | 126 +++++++++++++++++++++
common/hash.h | 7 ++
common/oid.c | 17 ---
common/oid.h | 2 -
common/tests/test-hash.c | 71 ++++++++++++
tools/tests/files/cacert3-trusted-multiple.pem | 4 +-
...-alias.pem => cacert3-trusted-server-alias.pem} | 4 +-
tools/tests/test-openssl.c | 14 +--
tools/tests/test.h | 5 +-
trust/tests/files/cacert3-trusted.pem | 4 +-
trust/tests/test-parser.c | 3 +-
14 files changed, 234 insertions(+), 51 deletions(-)
commit 1dc227b4fce16fcc721276925492f4ba4db00b4f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-20
hash: Rename file and functions for hashes
We're going to be adding other hashes. Also build as part of a
different common library.
common/Makefile.am | 2 +-
common/{checksum.c => hash.c} | 22 ++++++++++-----------
common/{checksum.h => hash.h} | 26 ++++++++++++-------------
common/tests/Makefile.am | 2 +-
common/tests/{test-checksum.c => test-hash.c} | 28 +++++++++++++--------------
common/x509.c | 4 ++--
tools/extract-jks.c | 14 +++++++-------
tools/extract-openssl.c | 10 +++++-----
trust/builder.c | 16 +++++++--------
trust/parser.c | 4 ++--
trust/tests/test-builder.c | 6 +++---
trust/tests/test-module.c | 10 +++++-----
12 files changed, 72 insertions(+), 72 deletions(-)
commit ef8c54a355d3f9814cc53a0aad72d61247b169a0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-19
Release version 0.17.3
NEWS | 7 +++++++
configure.ac | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
commit 80303340701c2cba78937193084f3d716b883b55
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-19
trust: Use descriptive labels for tokens
Try to determine which one is the system trust input token,
and which one is the default token by using datadir and sysconfdir
respectively.
https://bugs.freedesktop.org/show_bug.cgi?id=62534
trust/Makefile.am | 2 ++
trust/module.c | 63 +++++++++++++++++++++++++++++++++++++----------
trust/tests/Makefile.am | 2 ++
trust/tests/frob-token.c | 2 +-
trust/tests/test-module.c | 30 +++++++++++++++-------
trust/tests/test-token.c | 13 +++++++++-
trust/token.c | 22 +++++++++++++++--
trust/token.h | 5 +++-
8 files changed, 112 insertions(+), 27 deletions(-)
commit 832015f1fd91a9e94478514d7fe9b21e050f121a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-19
trust: Remove the temporary built in distrust objects
These should now be loaded from the .p11-kit persist format.
trust/token.c | 148 ----------------------------------------------------------
1 file changed, 148 deletions(-)
commit b6295dd63a8028ae0b239859406c477d779f4d5e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-19
extract: Make extracted output directories read-only
This is not a security feature or anything like that, but a hint
that the files are managed by the extract tool and should not be
modified manually.
tools/save.c | 60 ++++++++++++++++++++++++++++++++++++-------------
tools/tests/test-save.c | 25 +++++++++------------
tools/tests/test.c | 8 +++++--
3 files changed, 61 insertions(+), 32 deletions(-)
commit 7c27e9fbbe86b3268065f248eab2d6964983a715
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-19
trust: Don't use POSIX or GNU basename()
Both are nasty. Do our own, and test it a bit
https://bugs.freedesktop.org/show_bug.cgi?id=62479
common/compat.c | 44 +++++++++++++---------
common/compat.h | 17 ++++++---
common/tests/Makefile.am | 1 +
common/tests/test-compat.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++
trust/module.c | 5 ++-
trust/parser.c | 4 +-
6 files changed, 137 insertions(+), 27 deletions(-)
commit 535475c238c427cb685b4282997f7bce0876bfdf
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2013-03-19
Do not export (de)constructor
Rename p11_kit_init and p11_kit_fini to _p11_kit_init and _p11_kit_fini
respectively to stop them from being exported in the ABI. It does not seem
to be necessary.
p11-kit/util.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 1d60d5a6b8c5784b7ac10098c3d9b513094f49a8
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
Release version 0.17.2
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 4ad4d5742037f156e07a4e28b202e49984e27a89
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
trust: Fix trust tests on 32-bit builds
trust/tests/test-persist.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit ba67d1214f6d9254546997ceec310fce2f675679
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
trust: Fix invalid varargs call in the builder
trust/builder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit caaeaffb86c572f996bec31f67443da2219def84
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
Release version 0.17.1
* Fix distcheck bugs surrounding the strndup() workaround
NEWS | 16 ++++++++++++++++
common/compat.c | 22 +++++++++++++++++++++-
configure.ac | 9 ++-------
3 files changed, 39 insertions(+), 8 deletions(-)
commit 6c47831b3bfc66e1e995fb27e80c23085bb41e08
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
trust: Provide better debugging of trust module functions
Make C_FindObjects() and C_GetAttributeValue() functions dump the
attributes that they're dealing with when in debug mode.
trust/module.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
commit 128239732a5b7e184d5d9c505402630ee9215080
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
attrs: Change p11_attrs_to_string() to allow static templates
Allow passing the number of attributes to print, which lets us use
this directly on templates passed in by callers of the PKCS#11 API.
common/attrs.c | 13 ++++++++-----
common/attrs.h | 3 ++-
common/tests/test-attrs.c | 6 +++++-
trust/tests/frob-nss-trust.c | 2 +-
4 files changed, 16 insertions(+), 8 deletions(-)
commit 1ad9f98b11f3f0d411bf9517f1dc8985ea3dbe2a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
trust: Handle incorrectly encoded CKA_SERIAL_NUMBER lookups
Handle lookups for trust objects (by NSS) which expect CKA_SERIAL_NUMBER
attributes without appropriate DER encoding.
In addition allow creation of NSS trust objects as PKCS#11 session
objects, so that we can test this behavior.
trust/builder.c | 2 +-
trust/module.c | 47 +++++++++++++++++++++++++++++++++
trust/tests/test-module.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 114 insertions(+), 1 deletion(-)
commit f40e5f7129ece4b74aa2cb23b28b24b381bbe223
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
Add workaround for broken strndup() in firefox
Unconditionally use our own strndup() until this issue is resolved
and in the stable versions of various distros.
See: https://bugzilla.mozilla.org/show_bug.cgi?id=826171
configure.ac | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 749c0cdfeb3b7cc86165deb1cc51c32c0768a149
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
compat: Fix trivial comment
common/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 64aa734f484f81ac97914b2ddecf68ff76b317c0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
Use the nickname x-distrusted for CKA_X_DISTRUSTED
This is a non-standard PKCS#11 attribute, so has the X prefix
like the other ones we've added.
common/constants.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6c574777f6ab5996a9ba3bea493e96e4ad53dc69
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
trust: Better generation of nss objects and assertions for serial+issuer
In many cases certficates are distrusted by serial+issuer. Make sure
this works, and fix various cases where we weren't generating
compat NSS objects and compat trust assertions for these types
of input.
trust/builder.c | 267 ++++++++++++++++++++++------------------
trust/index.c | 3 +-
trust/tests/test-builder.c | 296 ++++++++++++++++++++++++++++-----------------
3 files changed, 341 insertions(+), 225 deletions(-)
commit a904e98b78b55e7a6213356225e45a04fdc457e1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-18
Refine looking up of attributes in arrays
There was a class of bugs for looking up invalid or empty
attributes in the internal PKCS#11 attribute arrays.
* Refine what p11_attrs_find_valid() treats as valid
* Rename p11_attrs_is_empty() to p11_attrs_terminator() for clarity
common/attrs.c | 62 ++++++++++++------------------
common/attrs.h | 11 ++----
common/mock.c | 44 +++++++--------------
common/tests/test-attrs.c | 54 ++++++++++++++++++++++++--
tools/extract-info.c | 21 +++-------
tools/extract-jks.c | 2 +-
tools/extract-openssl.c | 8 ++--
tools/tests/test-extract.c | 7 ++--
trust/builder.c | 96 +++++++++++++++++++++-------------------------
trust/index.c | 2 +-
trust/parser.c | 8 ++--
trust/tests/test-data.c | 2 +-
trust/tests/test-module.c | 4 +-
13 files changed, 158 insertions(+), 163 deletions(-)
commit f71baf6adf00626e73326149d55183bc62f827ae
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-17
trust: Remove file that's no longer used
trust/mozilla.c | 301 --------------------------------------------------------
1 file changed, 301 deletions(-)
commit d5b9e3915d75c04c547a0db7fe0c92839a0e78a5
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
Bump version number
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 062c09fbcad6945d6c40c5f2ce47894abdf87b07
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
Fix distcheck and documentation
common/tests/test-dict.c | 16 ++++++++--------
doc/manual/p11-kit-devel.xml | 15 +++++----------
trust/tests/Makefile.am | 3 +--
trust/tests/test-module.c | 7 +++++--
4 files changed, 19 insertions(+), 22 deletions(-)
commit 57e835d55f6eae39c25b97e35efe0cb58e46b897
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
trust: Update frob-nss-tool so it can compare modules for trust info
Can run with two modules now so that it can compare tokens NSS
trust info.
common/attrs.c | 23 ++++++
common/attrs.h | 2 +
trust/tests/frob-nss-trust.c | 174 ++++++++++++++++++++++++++++++++++---------
3 files changed, 164 insertions(+), 35 deletions(-)
commit 7fd74a78fcad81227be3650239669bca5851a1db
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
trust: Support a p11-kit specific serialization format
This is documented in doc/internals/ subdirectory
Add tests for the format as well.
https://bugs.freedesktop.org/show_bug.cgi?id=62156
common/Makefile.am | 2 +
common/basic.asn | 12 +
common/basic.asn.h | 13 +
doc/internal/persist-format.txt | 54 ++++
trust/Makefile.am | 1 +
trust/parser.c | 35 +++
trust/persist.c | 401 +++++++++++++++++++++++++++++
trust/persist.h | 59 +++++
trust/tests/Makefile.am | 1 +
trust/tests/input/verisign-v1.p11-kit | 17 ++
trust/tests/test-builder.c | 39 ---
trust/tests/test-data.h | 39 +++
trust/tests/test-module.c | 2 +-
trust/tests/test-parser.c | 32 +++
trust/tests/test-persist.c | 472 ++++++++++++++++++++++++++++++++++
trust/tests/test-token.c | 2 +-
16 files changed, 1140 insertions(+), 41 deletions(-)
commit 48004b92d4c65080ac71f6a48297abd4d83dfdcb
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-11
url: Split out the URL encoding and decoding functions
We want to use these as the format for encoding binary data
in our PKCS#11 attribute persistence
https://bugs.freedesktop.org/show_bug.cgi?id=62156
common/Makefile.am | 1 +
common/tests/Makefile.am | 1 +
common/tests/test-url.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++
common/url.c | 142 ++++++++++++++++++++++++++++++++++++++++
common/url.h | 59 +++++++++++++++++
p11-kit/uri.c | 120 ++++------------------------------
6 files changed, 381 insertions(+), 108 deletions(-)
commit 06bf3da80eb780621e0f1eb0ab8d4716ed7b3478
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-11
lexer: Make a lexer for our config file format
This lexer will be used in our PKCS#11 persistence format as well.
https://bugs.freedesktop.org/show_bug.cgi?id=62156
common/Makefile.am | 1 +
common/lexer.c | 238 +++++++++++++++++++++++++++++++++++++++
common/lexer.h | 84 ++++++++++++++
common/tests/Makefile.am | 1 +
common/tests/test-lexer.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/conf.c | 131 +++++++--------------
6 files changed, 644 insertions(+), 92 deletions(-)
commit 29af2c1eeca2fb0257e1172753b129d638472f0f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
trust: Use a SHA-1 hash of subjectPublicKeyInfo as CKA_ID by default
This is what's recommended by the spec, and allows stapled extensions
to hang off a predictable CKA_ID.
https://bugs.freedesktop.org/show_bug.cgi?id=62329
common/x509.c | 22 +++++++++++++++++
common/x509.h | 5 ++++
trust/builder.c | 20 +++++++++++-----
trust/parser.c | 48 +++++++++++++++++---------------------
trust/tests/files/verisign-v1.der | Bin 0 -> 576 bytes
trust/tests/test-builder.c | 18 +++++++++++++-
trust/tests/test-module.c | 10 ++++----
trust/tests/test-parser.c | 31 ++++++++++++++++++++++++
8 files changed, 115 insertions(+), 39 deletions(-)
commit 2d75eb32793a569dc3de359bb623713c80393d24
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-14
trust: Add a builder which builds objects out of parsed data
The builder completes the objects from the parsed data and takes
over the responsibilities that the parser and adapter previously
shared.
This is necessary to prepare for arbitrary data coming from
the p11-kit specific input files.
https://bugs.freedesktop.org/show_bug.cgi?id=62329
build/certs/entrust-invalid.der | Bin 0 -> 1120 bytes
build/certs/verisign-v1.der | Bin 0 -> 576 bytes
trust/Makefile.am | 2 +-
trust/adapter.c | 472 ------------
trust/builder.c | 1556 +++++++++++++++++++++++++++++++++++++
trust/{adapter.h => builder.h} | 36 +-
trust/parser.c | 836 +++++---------------
trust/parser.h | 45 +-
trust/session.c | 7 +-
trust/session.h | 2 +
trust/tests/Makefile.am | 1 +
trust/tests/test-builder.c | 1611 +++++++++++++++++++++++++++++++++++++++
trust/tests/test-data.c | 2 -
trust/tests/test-module.c | 28 +-
trust/tests/test-parser.c | 666 +++-------------
trust/tests/test-token.c | 58 +-
trust/token.c | 21 +-
17 files changed, 3593 insertions(+), 1750 deletions(-)
commit d7d68de6c9de9190c85da36b731e61ae3421a811
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-14
attrs: Add info functions for constant names and values
* For retrieving the name and/or nick of constants
* The nick is what we'll use in the file format
https://bugs.freedesktop.org/show_bug.cgi?id=62329
common/Makefile.am | 1 +
common/attrs.c | 242 ++--------------------------
common/constants.c | 363 ++++++++++++++++++++++++++++++++++++++++++
common/constants.h | 74 +++++++++
common/tests/Makefile.am | 1 +
common/tests/test-constants.c | 117 ++++++++++++++
6 files changed, 566 insertions(+), 232 deletions(-)
commit ff009f8a671e6ddd02a684bb1707a2a797fe4600
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-12
trust: Refactor to include concept of the index
* The index holds PKCS#11 objects whether for the token or for the session.
* The index provides hook for a builder to expand or validate objects
being added to the index.
* In addition theres a change hook so that a builder can maintain state
between objects, such as the compat NSS trust objects.
https://bugs.freedesktop.org/show_bug.cgi?id=62329
trust/Makefile.am | 1 +
trust/index.c | 566 +++++++++++++++++++++++
trust/index.h | 126 ++++++
trust/module.c | 111 ++---
trust/session.c | 121 +----
trust/session.h | 19 +-
trust/tests/Makefile.am | 2 +-
trust/tests/frob-token.c | 6 +-
trust/tests/test-index.c | 1063 ++++++++++++++++++++++++++++++++++++++++++++
trust/tests/test-module.c | 238 ++++++++++
trust/tests/test-session.c | 161 -------
trust/tests/test-token.c | 32 +-
trust/token.c | 32 +-
trust/token.h | 3 +-
14 files changed, 2097 insertions(+), 384 deletions(-)
commit 3fc6365093ad07b2eb5ef859093c5c5eb56ee700
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-14
attrs: New p11_attrs_merge() function
This takes one set of attributes and merges them into
another, without copying memory needlessly.
https://bugs.freedesktop.org/show_bug.cgi?id=62329
common/attrs.c | 52 ++++++++++++++++++++---
common/attrs.h | 4 ++
common/tests/test-attrs.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 153 insertions(+), 6 deletions(-)
commit 5208fc8539aabc626c1699f181e1191d6bb1c787
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-14
asn1: Implement a parsed ASN.1 tree cache
In order to unmarry the parser from the future builder, but still retain
efficiency, we need to be able to cache parsed ASN.1 trees. The ASN.1
cache provides this. In addition it carries around the loaded ASN.1
definitions.
https://bugs.freedesktop.org/show_bug.cgi?id=62329
common/asn1.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++
common/asn1.h | 21 +++++++++
common/tests/test-asn1.c | 46 ++++++++++++++++++++
3 files changed, 177 insertions(+)
commit 07a53cecc3220b3811f9db7514e49235fff32b94
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
extract: Combine trust policy when extracting
* Collapse multiple identical certificates coming from different
tokens. Note that if a certificate should not be placed multiple
times on a token. We cannot know which one to respect.
* Add a new extract filter: --trust-policy
This extracts all anchor and blacklist information
https://bugs.freedesktop.org/show_bug.cgi?id=61497
doc/manual/p11-kit.xml | 19 ++++-
tools/extract-info.c | 80 ++++++++++++++++++++-
tools/extract.c | 82 ++++++++++++++--------
tools/extract.h | 4 ++
tools/tests/test-extract.c | 171 +++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 313 insertions(+), 43 deletions(-)
commit 7fc0ecd1ca7840e71958e62163b27d645c936c25
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
extract: --comment option adds comments to PEM bundles
* Placed before the certificate, simple one liner
* No need to put comments in PEM files extracted into
directories, as the file names are already descriptive.
https://bugs.freedesktop.org/show_bug.cgi?id=62029
doc/manual/p11-kit.xml | 5 +++++
tools/extract-info.c | 20 ++++++++++++++++++++
tools/extract-openssl.c | 11 ++++++++++-
tools/extract-pem.c | 11 +++++++++--
tools/extract.c | 6 ++++++
tools/extract.h | 8 ++++++++
tools/tests/test-extract.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 103 insertions(+), 3 deletions(-)
commit 58e1e3764250fbda96c5ef7244e891a6be04d4cb
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
extract: Allow p11_save_write() to automatically calculate length
Also if automatically calculating length, then ignore input
that is NULL, as something that shouldn't be written out.
This allows easier chaining of optional output, such as comments.
https://bugs.freedesktop.org/show_bug.cgi?id=62029
tools/save.c | 11 +++++++--
tools/save.h | 4 ++--
tools/tests/files/empty-file | 0
tools/tests/files/simple-string | 1 +
tools/tests/test-save.c | 50 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 62 insertions(+), 4 deletions(-)
commit 8fd55c8089c90b52f00e4ffad572d1b9da72e6ba
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
p11-kit: New priority option and change trust-policy option
* Sort loaded modules appropriately using the 'priority' option. This
allows us to have a predictable order for callers, when callers
iterate through modules.
* Modules default to having an 'priority' option of '0'.
* If modules have the same order value, then sort by name.
* The above assumes the role of ordering trust-policy sources.
* Change the trust-policy option to a boolean
* Some of this code will be rearranged when the managed branch
is merged.
https://bugs.freedesktop.org/show_bug.cgi?id=61978
doc/manual/p11-kit-trust.xml | 5 ++-
doc/manual/pkcs11.conf.xml | 20 ++++++---
p11-kit/modules.c | 47 ++++++++++++++++++++++
p11-kit/tests/files/package-modules/four.module | 1 +
.../tests/files/package-modules/win32/four.module | 1 +
.../files/system-modules/two-duplicate.module | 1 +
p11-kit/tests/files/system-modules/two.badname | 1 +
.../tests/files/system-modules/win32/one.module | 3 +-
.../system-modules/win32/two-duplicate.module | 1 +
.../tests/files/system-modules/win32/two.badname | 1 +
p11-kit/tests/files/user-modules/three.module | 3 +-
.../tests/files/user-modules/win32/three.module | 3 +-
p11-kit/tests/test-modules.c | 42 +++++++++++++++++++
tools/extract.c | 47 +++-------------------
trust/p11-kit-trust.module | 14 +++++--
15 files changed, 136 insertions(+), 54 deletions(-)
commit 0e75a5ba8261955d4d75a38a528f79ff4edd5c21
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-06
trust: Make each configured path its own token
* Each source directory or file configured into the module or passed
in as an initialization argument becomes its own token.
Previously there was one token that contained certificates from
all the configured paths.
* These tokens are clearly labeled in the token info as
to the directory or file that they represent.
* Update PKCS#11 module logic to deal with multiple tokens, validate
the slot ids and so on.
* The order in which the paths are configured will become the
order of trust priority. This is the same order in which they
are listed through 'p11-kit list-modules' and C_GetSlotList.
* Update the frob-token internal tool to only play with one path
* Adjust tests where necessary to reflect the new state of things
and add tests for modified trust module code
https://bugs.freedesktop.org/show_bug.cgi?id=61499
trust/module.c | 202 +++++++++++++++++++++++---------
trust/tests/frob-token.c | 4 +-
trust/tests/test-module.c | 283 +++++++++++++++++++++++++++++++++++++++------
trust/tests/test-session.c | 2 +-
trust/tests/test-token.c | 33 +++++-
trust/token.c | 64 ++++------
trust/token.h | 8 +-
7 files changed, 460 insertions(+), 136 deletions(-)
commit d2128c263ea77e4f99bccc6ac46964ad419ec2d1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-06
dict: Allow removal of current item in a p11_dict iteration
* This was already possible to do safely before
* Document and test this behavior
https://bugs.freedesktop.org/show_bug.cgi?id=61499
common/dict.h | 2 ++
common/tests/test-dict.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
commit 86e60637394340ef2fa3b3db6b451dac1d73052b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-14
trust: Rework input path treatment
* Accept a single --with-trust-paths argument to ./configure
which cotnains all the input paths.
* The --with-system-anchors and --with-system-certificates
./configure arguments are no longer supported. Since they were
only present briefly, no provision is made for backwards
compatibility.
* Each input file is treated as containing anchors by default
unless an input certificate contains detailed trust information.
* The files in each input directory are not automatically treated
as anchors unless a certificate contains detailed trust information.
* The files in anchors/ subdirectory of each input directory are
automatically marked as anchors.
* The files in the blacklist/ subdirectory of each input directory
are automatically marked as blacklisted.
* Update tests and move around test certificates so we can
test these changes.
https://bugs.freedesktop.org/show_bug.cgi?id=62327
build/certs/Makefile.am | 13 ++-
build/certs/self-signed-with-ku.der | Bin 501 -> 478 bytes
configure.ac | 74 ++++---------
doc/manual/p11-kit-trust.xml | 61 +++++-----
p11-kit/p11-kit-1.pc.in | 3 -
trust/module.c | 21 ++--
trust/parser.c | 47 +++++++-
trust/tests/certificates/self-signed-with-ku.der | Bin 501 -> 0 bytes
.../self-signed-with-eku.der | Bin
trust/tests/frob-token.c | 2 +-
trust/tests/{ => input}/anchors/cacert3.der | Bin
trust/tests/{ => input}/anchors/testing-ca.der | Bin
.../{files => input/blacklist}/self-server.der | Bin
trust/tests/{certificates => input}/cacert-ca.der | Bin
trust/tests/input/distrusted.pem | 23 ++++
trust/tests/test-module.c | 8 +-
trust/tests/test-session.c | 2 +-
trust/tests/test-token.c | 123 ++++++++++++++++++++-
trust/token.c | 78 ++++++++-----
trust/token.h | 3 +-
20 files changed, 318 insertions(+), 140 deletions(-)
commit bf63f009cd4a1147a3e0684d898f140f46666b0e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-15
pem: Fix a bug decoding some PEM files
When bringing over the BSD base64 code, there was a regression.
In addition add some tests for the base64 stuff.
common/base64.c | 19 ++--
common/tests/Makefile.am | 1 +
common/tests/test-base64.c | 212 +++++++++++++++++++++++++++++++++++++++++++
trust/tests/files/thawte.pem | 25 +++++
4 files changed, 246 insertions(+), 11 deletions(-)
commit 08f11e4c8fb173ed1341e6e0cf0cb0403df7e547
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-10
Don't overwrite the build directory when uploading documentation
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3177cbccb237bfef66721eeb773b574f1d8ba076
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-10
Fix up the system anchors/certificates configure arguments
Double check various combinations, and make sure we don't fail
needlessly when --disable-trust-module. Also check that actual
paths are passed into the arguments.
configure.ac | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
commit df29c0dcb6cce6a215dee9dc4e17aff59ae67c5b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-11
doc: Move manual into doc/manual subdirectory
.gitignore | 34 ++++----
Makefile.am | 2 +-
configure.ac | 7 +-
doc/Makefile.am | 132 +------------------------------
doc/manual/Makefile.am | 132 +++++++++++++++++++++++++++++++
doc/{ => manual}/annotation-glossary.xml | 0
doc/{ => manual}/docbook-params.xsl | 0
doc/{ => manual}/p11-kit-config.xml | 0
doc/{ => manual}/p11-kit-devel.xml | 0
doc/{ => manual}/p11-kit-docs.sgml | 0
doc/{ => manual}/p11-kit-overrides.txt | 0
doc/{ => manual}/p11-kit-sections.txt | 0
doc/{ => manual}/p11-kit-sharing.xml | 0
doc/{ => manual}/p11-kit-trust.xml | 6 +-
doc/{ => manual}/p11-kit.xml | 2 +-
doc/{ => manual}/pkcs11.conf.xml | 0
doc/{ => manual}/style.css | 0
doc/{ => manual}/version.xml.in | 0
18 files changed, 159 insertions(+), 156 deletions(-)
commit 0a6bf1bfad01aae0b707b9e13e6d14deade9cecf
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-12
Release version 0.16.4
NEWS | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
commit 22993290d75bacb33c177be8ee2bc78ea0687ac8
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-11
tools: Display per-command help appropriately
* Fixes a regression
* In addition allows --help to be specified before the command. If
a command is present, command help will be shown
https://bugs.freedesktop.org/show_bug.cgi?id=62153
tools/tool.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
commit c80956aef3abaa90fa9ab7c2873a45adbe127dc4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-11
tools: Initialize local debug code correctly
Unless initialized according to the environment all debug output
is printed.
https://bugs.freedesktop.org/show_bug.cgi?id=62152
tools/tool.c | 3 +++
1 file changed, 3 insertions(+)
commit ee632a4a904f9f16c66a24c97f5724f0c3150b10
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Release version 0.16.3
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit b5660380769aa5b1c9b51af7e0fd2f18ed463a7e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
iter: Don't skip tokens that don't have CKF_TOKEN_INITIALIZED
This flag is not required to be set unless C_InitToken has been
called. Many modules, like libnssckbi.so, do not set this flag.
p11-kit/iter.c | 4 ----
p11-kit/tests/test-iter.c | 33 ---------------------------------
2 files changed, 37 deletions(-)
commit ab14d9291df41b27f70ec3158d94f50f68ed80e1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
trust: add a simple frob-nss-token tool to dump distrust
Add a simple tool to dump NSS style distrust attributes from
a module.
trust/tests/Makefile.am | 6 +++
trust/tests/frob-nss-trust.c | 103 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+)
commit 6ecf586a1e31f2874c7b185f4f2061aa9e83c08a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
trust: Use the new NSS PKCS#11 extension codes
NSS had subtly changed the values of the distrust CK_TRUST codes
so update them to stay in sync.
common/attrs.c | 76 +++++++++++++++++++++++------------------------
common/pkcs11x.h | 59 ++++++++++++++++++------------------
trust/adapter.c | 22 +++++++-------
trust/tests/test-module.c | 4 +--
trust/tests/test-parser.c | 22 +++++++-------
trust/token.c | 6 ++--
6 files changed, 95 insertions(+), 94 deletions(-)
commit 66fbcf7b6aac7fb808d3146335625cc15d4d2959
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Hard code distrust temporarily.
This is because we have no way to load this data into the trust module.
Working on a real solution.
trust/token.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 149 insertions(+), 1 deletion(-)
commit b96095115a17818d3e6107e10bad0fef757611d7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
tools: Parse global options appropriately, even if after command
tools/tool.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
commit 2ce1b21109c90b7dab240806686829e498875d74
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
trust: Refactor how we load builtin objects
trust/token.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
commit b06b58b275ebccf6d7360083708b2614dd75e1b5
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Don't shove messages into debug output if they're already displayed
common/library.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 347ac14998835ee18e5958a8b7c9aa1afec8eaa2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Release 0.16.2
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit ba9cb5cab824fa4180355def6bc2e464b4e24ab0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
extract: Use bool instead of int where appropriate
tools/extract-info.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
commit d7aee0a1ab76fb1299db5cf398088ebec1fe98be
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
tools: Add a bit of debugging to the PEM extract handler
common/debug.h | 1 +
tools/extract-pem.c | 3 +++
2 files changed, 4 insertions(+)
commit 082bc5773abe1c003bf34bbb3bf6a6b5282a212c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
extract: Fix regression in --purpose option
The --purpose option would only match certificates that had no
purposes marked on them. Fix it so that it correctly matches
certificates with the given purpose.
https://bugs.freedesktop.org/show_bug.cgi?id=62009
tools/extract-info.c | 13 ++++++++++--
tools/tests/test-extract.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
commit fc383e025f09af70d3eb52fcd7e03c02733b14b0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Document and put code coverage online
* Document our testing practices
* Put lcov code coverage output online
Makefile.am | 16 ++++++++++++----
doc/p11-kit-devel.xml | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
commit 945585b698b08b6f349e2e104862589b5acce0aa
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-08
Properly detect the stdbool.h header
https://bugs.freedesktop.org/show_bug.cgi?id=62001
configure.ac | 2 ++
1 file changed, 2 insertions(+)
commit cc6189fc4051be33c6f5c86ab767e614633bf831
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
Release version 0.16.1
NEWS | 5 +++++
configure.ac | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 85eaff1aebb0e6625382fba179164490b6ebb538
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
doc: Fix external URLs in documentation
doc/p11-kit-devel.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit ae05057c69a6ef9ed49b47db6e9ba2b8acdcfe23
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
doc: Add P11_KIT_STRICT=yes debugging tip
doc/p11-kit-devel.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
commit 220d7b027871f79f446c7b3c2db9ef43f24c19cc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
x509: Don't break when cA field of BasicConstraints is missing
The field defaults to FALSE. It sucks that libtasn1 doesn't
fill this in for us.
https://bugs.freedesktop.org/show_bug.cgi?id=61975
common/x509.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
commit 3e532011ac100391315ffa13f537ed130cc45b2e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
tools: Remove extra debugging statement when running external commands
tools/tool.c | 1 -
1 file changed, 1 deletion(-)
commit be5d505fe840836561488bba3d11d8584ca9cb97
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
extract-trust: Turn into a placeholder script that does nothing
If the 'p11-kit extract-trust' command is to be used by
distributions, make them customize it appropriately.
tools/p11-kit-extract-trust.in | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
commit 0644bfd4c09c710fec1ed424779919fea7c06fca
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-07
doc: Don't wrap the options in the pkcs11.conf manual page
doc/pkcs11.conf.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit 7b3da7d5bdaa97488668a16fcf1ea04b3d9de64e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-04
Release version 0.16.0
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit 3f13da890649b8cb88e8e2e39872831c13567a1e
Author: Stef Walter <stefw@redhat.com>
Date: 2013-03-04
Build with the libtasn1 CFLAGS properly
Tweaks by: Roman Bogorodskiy <bogorodskiy@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=61739
common/Makefile.am | 3 +++
common/tests/Makefile.am | 4 ++++
tools/Makefile.am | 4 +++-
tools/tests/Makefile.am | 4 +++-
trust/Makefile.am | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
commit 14b3b3d158bdd874f5bbd626f948d20e78b38f01
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-04
Redo mock.h header in order to relicense
Rewrite the mock.h header to relicense it. It is based on the BSD
licensed mock.c file, so this isn't a big issue.
common/mock.h | 1353 +++++++++++++++++++++++++++++----------------------------
1 file changed, 686 insertions(+), 667 deletions(-)
commit a90cb3cc21fc479434165c8c531e1e49a6de6dd4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-04
Remove duplicate typedef
https://bugs.freedesktop.org/show_bug.cgi?id=60894
p11-kit/iter.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 3ccec864bfc57ebdd524a0c9603aca829c64e3dc
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2013-03-03
Fix missing bracket in trust module check
This fixes building --without-libtasn1
https://bugs.freedesktop.org/show_bug.cgi?id=61740
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 205ed0e0e26010150950e9e963a9a36693b5f71e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Initialize modules correctly in tests
This fixes hangs when running tests on windows
tools/tests/test-extract.c | 2 ++
tools/tests/test-openssl.c | 2 ++
tools/tests/test-pem.c | 2 ++
tools/tests/test-save.c | 2 ++
tools/tests/test-x509.c | 2 ++
trust/tests/test-module.c | 2 +-
trust/tests/test-parser.c | 1 +
trust/tests/test-session.c | 1 +
trust/tests/test-token.c | 1 +
9 files changed, 14 insertions(+), 1 deletion(-)
commit 6c55425a7de23a71d0abc3137f0015e878188bae
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Windows doesn't support symlinks, chmod, or atomic renames
* Don't create symlinks on windows
* No atomic renames, so delete and then rename
* Make sure to close files before unlinking on windows
* No chmod permissions on windows
tools/extract-openssl.c | 14 +++++++++++++-
tools/save.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
tools/save.h | 4 ++++
tools/tests/test-openssl.c | 7 ++++++-
tools/tests/test-save.c | 26 ++++++++++++++++++++++++--
tools/tests/test.c | 4 ++++
tools/tests/test.h | 8 ++++++++
7 files changed, 101 insertions(+), 6 deletions(-)
commit 3acf285916968a05ea42b3ef0f9654a33e308da7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Use mingw compatible coverage flags
The way that coverage is built and linked is different with mingw
so just use the --coverage flag to represent the correct behavior
when cross compiling.
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5868e4aba23b211d8dd35af5061939ee72fe9c41
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Don't use wchar_t for storing unicode characters
On Win32 wchar_t is only 2 bytes, which breaks our UTF-8 conversion
functions.
common/utf8.c | 71 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 36 insertions(+), 35 deletions(-)
commit bee435e09111f43dcc406160e9c9bdd8645fc86c
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Fix syntax errors in OS_WIN32 ifdefs
common/compat.h | 4 ++--
common/library.c | 6 +++---
p11-kit/conf.c | 2 +-
p11-kit/util.c | 4 ++--
trust/module.c | 6 ++++--
trust/tests/test-module.c | 2 ++
6 files changed, 14 insertions(+), 10 deletions(-)
commit 61e0cb5dddb89ddab1d68791eb28d892c114622f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Open files in binary mode on windows
So that the Windows' C library doesn't munge line endings
common/compat.h | 4 ++++
p11-kit/conf.c | 2 +-
p11-kit/pin.c | 2 +-
tools/tests/test.c | 11 +++++------
4 files changed, 11 insertions(+), 8 deletions(-)
commit d9076a99c59bb0132b25277a2340f428c9b6c98e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Add compat gmtime_r() and timegm() functions
Not available on Win32 or ancient unixes
common/compat.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/compat.h | 15 +++++++++++++++
configure.ac | 6 ++++++
3 files changed, 76 insertions(+)
commit 2737be8914270275d07ccf4526a4ba8b781c195e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Add compat mkstemp() and mkdtemp() functions
Not available on Win32 or ancient unixes
common/compat.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/compat.h | 12 +++++
2 files changed, 156 insertions(+)
commit 193f0043a546e0ef186addb2a0487d09e690d5b1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Add compat vasprintf() and asprintf() functions
These are not available on Win32 and ancient unixes
common/compat.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/compat.h | 17 +++++++++++++++
configure.ac | 1 +
3 files changed, 84 insertions(+)
commit 66ee55e5947682d10eed7a36b9da72a8cf6a40f2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Add compat strndup() function
Not available on Win32 and ancient unixes
common/compat.c | 22 ++++++++++++++++++++++
common/compat.h | 7 +++++++
configure.ac | 1 +
3 files changed, 30 insertions(+)
commit ae76545a0094114ef29dba52df97e69ab28b3dbc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Abstract mmap() into a compat API
The Win32 for mmap() is very different from Unix, so abstract
this into our own p11_mmap_xxx() functions.
common/compat.c | 158 +++++++++++++++++++++++++++++++++++++----------
common/compat.h | 16 +++++
common/tests/frob-cert.c | 35 ++++-------
tools/tests/test.c | 2 +
trust/parser.c | 28 +++------
5 files changed, 160 insertions(+), 79 deletions(-)
commit 38acf11889c1e1da2610c8e05f1f380f2a2a1ae6
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Use putenv() instead of setenv()
Since older operating systems don't support setenv()
common/tests/test-asn1.c | 2 +-
common/tests/test-attrs.c | 2 +-
common/tests/test-buffer.c | 2 +-
common/tests/test-oid.c | 2 +-
common/tests/test-x509.c | 2 +-
p11-kit/tests/conf-test.c | 2 +-
p11-kit/tests/pin-test.c | 2 +-
p11-kit/tests/progname-test.c | 2 +-
p11-kit/tests/test-init.c | 2 +-
p11-kit/tests/test-iter.c | 2 +-
p11-kit/tests/test-modules.c | 2 +-
p11-kit/tests/uri-test.c | 2 +-
trust/tests/test-module.c | 2 +-
trust/tests/test-parser.c | 2 +-
trust/tests/test-session.c | 2 +-
trust/tests/test-token.c | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
commit 7823c9ddcb18b5155b3cc0e9d9f57ad0333d5eba
Author: Stef Walter <stefw@gnome.org>
Date: 2013-03-03
Add compat implementation of basename()
For Win32 and older unixes
common/compat.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/compat.h | 6 ++++++
configure.ac | 5 +++--
3 files changed, 71 insertions(+), 2 deletions(-)
commit 02d7da2ba2247d017f248dd48e4365bd0a219bff
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-24
tools: Update comments for cacerts jks format
tools/extract-jks.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit b06bee023df6f4f2b004030e86e8ee90579681f5
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-20
Rename p11_module_xxx() compat functions to p11_dl_xxx()
For clarity. In addition, make p11_dl_close() able to be used
as a destroyer callback.
Also make p11_dl_error() return an allocated string
common/compat.c | 18 +++++++++---------
common/compat.h | 20 ++++++++++----------
p11-kit/modules.c | 15 ++++++++++-----
3 files changed, 29 insertions(+), 24 deletions(-)
commit 6521cccc021530f59f2f5e60a9cbf0c5b458360d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-15
Update the pkcs11.h header for missing mechanisms
common/attrs.c | 2 +-
common/pkcs11.h | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
commit 95ec58961a480c15fe780bbce6d6cd974f478407
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-06
Only do shared object and DLL initialization in libraries
Don't do library initialization on shared object load when not running
in a library. We'll want to plug into this and do different things
per library in the future.
common/library.c | 60 +++++++++++---------------------------------------------
common/library.h | 2 ++
p11-kit/util.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
trust/module.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 122 insertions(+), 49 deletions(-)
commit c6ebe7eb68e07e4f22c7b7ede14a1e4f04e893b7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-15
Move pkcs11.conf and module documentation to a manual page
.gitignore | 1 +
doc/Makefile.am | 19 ++++-
doc/p11-kit-config.xml | 166 +++------------------------------------
doc/p11-kit-docs.sgml | 3 +-
doc/p11-kit.xml | 5 +-
doc/pkcs11.conf.xml | 207 +++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 239 insertions(+), 162 deletions(-)
commit 726e98ed071601770c2724f358eabbbc682f1fdc
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-13
Pull translations from transifex
* Build a script to help with this
https://bugs.freedesktop.org/show_bug.cgi?id=60792
.gitignore | 1 +
Makefile.am | 3 +
build/tx-update | 68 +++++++++++
po/LINGUAS | 34 ++++++
po/bg.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/cs.po | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/de.po | 24 ++--
po/el.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/en_GB.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/eo.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/es.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/eu.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/fa.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/fi.po | 20 ++--
po/fr.po | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/gl.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/hr.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/hu.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ia.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/id.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/it.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ja.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ka.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ko.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/lv.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/nl.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pa.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pl.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pt_BR.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/ru.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sk.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sl.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sq.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sr.po | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/te.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/tr.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/uk.po | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_CN.po | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_HK.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/zh_TW.po | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
40 files changed, 11845 insertions(+), 21 deletions(-)
commit 380f457ce458e32f1ccc15acfa664df82629981f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-12
Relicense the buffer code appropriate for inclusion in p11-kit
* All original lines in this file upon arrival in the p11-kit
project were written by me, and copyright held by me.
common/buffer.c | 57 ++++++++++++++++++++++++++++++++++-----------------------
common/buffer.h | 57 ++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 68 insertions(+), 46 deletions(-)
commit 65e68c88d85d8b6896afe9f9e101aefb618ce6be
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-12
Release version 0.15.2
* This is an unstable release
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
commit efef089a772f4f05caefebf2a6466b4225dc9b00
Author: Timo Jyrinki <timo.jyrinki@iki.fi>
Date: 2013-02-12
Add finish translation
po/LINGUAS | 1 +
po/fi.po | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 344 insertions(+)
commit 41b3f707906a4f6273f7fdb1174be3343bbf1ea7
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2011-09-24
Add and enable German gettext translation
Enable installation of gettext translations and add German translation
by Chris Leick.
.gitignore | 3 +
configure.ac | 3 +
po/LINGUAS | 4 +
po/de.po | 351 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 361 insertions(+)
commit b90410f7c6ef5e1bb73837d7ddbda855a91ac79f
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2013-02-12
Respect destdir when creating package module config directory
p11-kit/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 04781672277a537551c369ae71ecdc8410e31dc3
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-11
Fix dereference of varargs in p11_attrs_build()
https://bugs.freedesktop.org/show_bug.cgi?id=60473
common/attrs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 077fd91bed34bb6226e0a43a26f9e546372db54a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-11
Remove unnecessary code to be more compatible with various libtasn1 versions
https://bugs.freedesktop.org/show_bug.cgi?id=60434
common/asn1.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit 828df42b98fa0ffc1695db8af9bd0bd03f2583bc
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2013-02-07
Don't require explictly disabling trust module if --without-libtasn1
And provide more intelligent error messages about why to build
with libtasn1
Tweaked by Stef Walter
configure.ac | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
commit 2e8ce8c5ecb6d1f1c8f0af244d9f9b75dc6050ea
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-06
Fix various clang analyzer warnings
* Add annotations to our precondition functions so that they
don't make the analyzer complain
common/compat.h | 13 +++++++++++++
common/debug.h | 3 ++-
p11-kit/conf.c | 2 +-
p11-kit/pin.c | 3 ++-
p11-kit/uri.c | 1 -
tools/extract-openssl.c | 9 +++++++--
tools/extract.c | 3 +++
tools/tool.c | 3 +--
8 files changed, 29 insertions(+), 8 deletions(-)
commit 0c6517104d1306228c31e596b0df6a4fb5af4dd1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Our minimum version of libtasn1 is 2.14
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e7fe6fd2cdde5e15a14abca39303c5049174f4f9
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Release version 0.15.1
* This is an unstable release
NEWS | 14 ++++++++++++++
configure.ac | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
commit f3a3e1e6a413dc93d0a1eb330a32404d803f5307
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-03
Add a placeholder external 'extract-trust' command
.gitignore | 1 +
configure.ac | 1 +
doc/p11-kit-devel.xml | 23 +++++++++++++++++++++++
doc/p11-kit.xml | 19 +++++++++++++++++++
tools/Makefile.am | 4 ++++
tools/p11-kit-extract-trust.in | 27 +++++++++++++++++++++++++++
6 files changed, 75 insertions(+)
commit 08f1a7f3cfe87bc19ecd564711b4d2beaa603924
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-01
Implement support for java JKS keystore format
* All aliases must be lower case in order to work with the
default keystore implementation.
doc/p11-kit.xml | 4 +
tools/Makefile.am | 2 +-
tools/extract-jks.c | 331 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/extract.c | 4 +-
4 files changed, 339 insertions(+), 2 deletions(-)
commit 32ca4f6d3167d08fc985d66fe48f453954596f87
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-03
Use the CN, OU or O of certificates to generate a label
* This is in cases where the certificate information does not
already have a friendly name or alias.
common/Makefile.am | 1 +
common/oid.h | 18 +++++
common/tests/Makefile.am | 1 +
{tools => common}/tests/test-utf8.c | 0
common/tests/test-x509.c | 81 +++++++++++++++++++++
{tools => common}/utf8.c | 0
{tools => common}/utf8.h | 0
common/x509.c | 136 ++++++++++++++++++++++++++++++++++++
common/x509.h | 16 +++++
tools/extract-openssl.c | 70 ++++---------------
tools/tests/Makefile.am | 7 --
tools/tests/test-openssl.c | 16 +++--
trust/parser.c | 51 ++++++++------
trust/tests/test-parser.c | 22 +++---
14 files changed, 318 insertions(+), 101 deletions(-)
commit 39e9f190416ecb4260a3b079e1d79fc2e55f5a33
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-30
Add support for exporting OpenSSL's TRUSTED CERTIFICATE format
build/certs/Makefile.am | 9 +
doc/p11-kit.xml | 8 +
tools/Makefile.am | 2 +
tools/extract-openssl.c | 686 +++++++++++++++++++++
tools/extract.c | 4 +
tools/tests/Makefile.am | 15 +
tools/tests/files/cacert3-distrust-all.pem | 44 ++
tools/tests/files/cacert3-distrusted-all.pem | 43 ++
tools/tests/files/cacert3-not-trusted.pem | 42 ++
tools/tests/files/cacert3-trusted-alias.pem | 42 ++
.../files/cacert3-trusted-client-server-alias.pem | 43 ++
tools/tests/files/cacert3-trusted-keyid.pem | 42 ++
tools/tests/files/cacert3-trusted-multiple.pem | 85 +++
tools/tests/test-openssl.c | 671 ++++++++++++++++++++
tools/tests/test-utf8.c | 252 ++++++++
tools/tests/test.h | 9 +
tools/utf8.c | 328 ++++++++++
tools/utf8.h | 53 ++
18 files changed, 2378 insertions(+)
commit dbcf3c049f4aadc1d25eb952b4feabdec14cf35d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-30
Add support for extracting to pem-bundle and pem-directory formats
build/certs/Makefile.am | 2 +
doc/p11-kit.xml | 8 ++
tools/Makefile.am | 1 +
tools/extract-pem.c | 125 +++++++++++++++++
tools/extract.c | 2 +
tools/tests/Makefile.am | 8 ++
tools/tests/files/cacert3-twice.pem | 84 +++++++++++
tools/tests/files/cacert3.pem | 42 ++++++
tools/tests/test-pem.c | 269 ++++++++++++++++++++++++++++++++++++
9 files changed, 541 insertions(+)
commit 5df24bf0fb8532e0ebdf5f2366834848fdf6097d
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-23
Implement code for writing PEM
* Based on the gcr code
* Bring in base64 output code from BSD
* Make sure to output base64 lines of 64 character length since
this is what OpenSSL expects
common/base64.c | 62 ++++++++++++++++++++++++++
common/base64.h | 6 +++
common/pem.c | 54 ++++++++++++++++++++++-
common/pem.h | 5 +++
common/tests/test-pem.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++--
5 files changed, 237 insertions(+), 4 deletions(-)
commit 722efb88cf12261d705e2a6dfb4aceab9ff7b76f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-30
Implement basic extract support
* The only formats supported are x509-file and x509-directory
Allow tool to build without extract
configure.ac | 1 +
doc/Makefile.am | 1 -
doc/p11-kit.xml | 95 ++++++++++
doc/style.css | 4 +
tools/Makefile.am | 20 +-
tools/extract-info.c | 359 +++++++++++++++++++++++++++++++++++
tools/extract-x509.c | 116 ++++++++++++
tools/extract.c | 461 +++++++++++++++++++++++++++++++++++++++++++++
tools/extract.h | 110 +++++++++++
tools/tests/Makefile.am | 15 ++
tools/tests/test-extract.c | 301 +++++++++++++++++++++++++++++
tools/tests/test-x509.c | 276 +++++++++++++++++++++++++++
tools/tests/test.h | 33 ++++
tools/tool.c | 3 +
tools/tool.h | 3 +
15 files changed, 1796 insertions(+), 2 deletions(-)
commit 9a21e6ddf9eb7bb0f13f01cddba9dedd7a6e43b3
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-23
Support for sane writing to files extracted
* Implement atomic writes of files
* Writing with checks that not overwriting anything unless desired
* Writing and overwriting of directory contents in a robust way
build/certs/Makefile.am | 2 +
configure.ac | 1 +
tools/Makefile.am | 3 +
tools/save.c | 462 +++++++++++++++++++++++++++++++++++++++
tools/save.h | 79 +++++++
tools/tests/Makefile.am | 52 +++++
tools/tests/files/cacert3.der | Bin 0 -> 1885 bytes
tools/tests/test-save.c | 494 ++++++++++++++++++++++++++++++++++++++++++
tools/tests/test.c | 200 +++++++++++++++++
tools/tests/test.h | 211 ++++++++++++++++++
10 files changed, 1504 insertions(+)
commit 3e70ecbab850bcc08ee89e1256d82cca70d80ee7
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-21
Add public iterator API to p11-kit
common/mock.c | 113 +++-
common/mock.h | 37 ++
doc/Makefile.am | 1 +
doc/annotation-glossary.xml | 67 +++
doc/p11-kit-docs.sgml | 3 +
doc/p11-kit-sections.txt | 17 +
p11-kit/Makefile.am | 2 +
p11-kit/iter.c | 829 +++++++++++++++++++++++++++++
p11-kit/iter.h | 101 ++++
p11-kit/p11-kit.h | 2 +
p11-kit/tests/Makefile.am | 4 +-
p11-kit/tests/mock-module-ep.c | 2 +-
p11-kit/tests/test-iter.c | 1140 ++++++++++++++++++++++++++++++++++++++++
13 files changed, 2308 insertions(+), 10 deletions(-)
commit e5816187231ce27e5f634995e62c1d3ae5c5b2f1
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-21
Allow internal use of token and module info matching
p11-kit/private.h | 6 ++++++
p11-kit/uri.c | 55 +++++++++++++++++++++++++++++++++++--------------------
2 files changed, 41 insertions(+), 20 deletions(-)
commit 67ce28e9d9ec1528c9b762b0912d6a7e339fbcd5
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-21
Move the X.509 extension parsing code in common/
* So it can be used by other code, in addition to the trust stuff
common/tests/test-x509.c | 191 +++++++++++++++++++++++++++++++++++++++++++++--
common/x509.c | 67 ++++++++++++++++-
common/x509.h | 9 ++-
trust/adapter.c | 132 ++++++++++++++++++--------------
trust/parser.c | 69 ++---------------
5 files changed, 335 insertions(+), 133 deletions(-)
commit 5e4a3ea9b8f254d99544490eed8e17e88c81f975
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-18
Add p11_array_clear() function
* Clears an array without freeing the array itself
common/array.c | 21 ++++++++++++++-------
common/array.h | 2 ++
common/tests/test-array.c | 27 +++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 7 deletions(-)
commit 4400d8ecc4525cfc848937dc562c542fc58a533a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-04
Implement trust assertion PKCS#11 objects
* Implement trust assertions for anchored and distrusted certs
* Pinned certificate trust assertions are not implemented yet
* Add an internal tool for pulling apart bits of certificates
common/oid.h | 1 -
common/tests/Makefile.am | 1 +
common/tests/test-oid.c | 18 +-
doc/p11-kit-trust.xml | 11 +
trust/Makefile.am | 2 +-
trust/adapter.c | 456 ++++++++++++++++++++++++++++++++++++++++
trust/{mozilla.h => adapter.h} | 8 +-
trust/p11-kit-trust.module | 3 +
trust/parser.c | 5 +-
trust/tests/files/redhat-ca.der | Bin 0 -> 948 bytes
trust/tests/test-parser.c | 352 ++++++++++++++++++++++++++++---
11 files changed, 804 insertions(+), 53 deletions(-)
commit 7e61265ced3f33685b68bb6e2c7505485cfe0177
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-04
Refactor how parsing of ASN.1 data and certificate extensions work
common/Makefile.am | 2 +
common/asn1.c | 551 ++++++++++++++++++++++++++++++++++++++++++++++
common/asn1.h | 65 ++++++
common/oid.h | 12 +-
common/tests/Makefile.am | 2 +
common/tests/test-asn1.c | 113 ++++++++++
common/tests/test-x509.c | 185 ++++++++++++++++
common/x509.c | 152 +++++++++++++
common/x509.h | 56 +++++
trust/mozilla.c | 31 ++-
trust/parser.c | 546 +++------------------------------------------
trust/parser.h | 14 +-
trust/tests/test-data.h | 28 +--
trust/tests/test-parser.c | 103 ---------
14 files changed, 1193 insertions(+), 667 deletions(-)
commit 8b02ff64b30311a4730b60dd72590435f56fb3a2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-03
Fill in certificate authority and trust data correctly
* Fill in CKA_CERTIFICATE_CATEGORY properly for authorities
based on the presence of BasicConstraints and/or v1 certificates
* Fill in CKA_TRUSTED and CKA_X_DISTRUSTED based on whether the
parser is running for anchors or blacklist
* In addition support the concept of blacklisted certificates mixed
in with the anchors (without any purposes) since that's what exists
in the real world.
* We do this after the various hooks have had a chance to mess
with the certificate extensions and such.
common/oid.h | 9 +-
trust/mozilla.c | 74 +++++-----
trust/parser.c | 351 ++++++++++++++++++++++++++++++++++++----------
trust/parser.h | 11 +-
trust/tests/test-data.c | 18 ++-
trust/tests/test-data.h | 9 ++
trust/tests/test-parser.c | 246 ++++++++++++++++++++++++--------
trust/tests/test-token.c | 2 +-
8 files changed, 552 insertions(+), 168 deletions(-)
commit 18bb2582c32f4373f7ed85894fb490f2733cb03b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-02
Implement stapled certificate extensions internally
* Use stapled certificate extensions to represent loaded trust policy
* Build NSS trust objects from stapled certificate extensions
* Add further attribute debugging for NSS trust objects
* Use a custom certificate extension for the OpenSSL reject purpose data
* Use SubjectKeyIdentifier for OpenSSL keyid data
* Use ExtendedKeyUsage for OpenSSL trust purpose data
* Implement simple way to handle binary DER OIDs, using the DER TLV
length. DER OIDs are used in the CKA_OBJECT_ID value, and elsewhere.
* Split out the building of NSS trust objects from the main parser
common/Makefile.am | 1 +
common/compat.c | 2 +-
common/compat.h | 2 +-
common/oid.c | 100 +++++
common/oid.h | 209 +++++++++
common/tests/Makefile.am | 2 +
common/tests/frob-ku.c | 28 +-
common/tests/frob-oid.c | 100 +++++
common/tests/test-oid.c | 133 ++++++
trust/Makefile.am | 1 +
trust/mozilla.c | 284 ++++++++++++
trust/mozilla.h | 44 ++
trust/parser.c | 724 +++++++++++++++++-------------
trust/parser.h | 39 +-
trust/tests/files/self-signed-with-ku.der | Bin 0 -> 478 bytes
trust/tests/test-data.c | 9 +-
trust/tests/test-parser.c | 159 +++++--
17 files changed, 1450 insertions(+), 387 deletions(-)
commit 3b482acc47ba971406db526ebddf589ad1a8f16e
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-02
Better debugging and checks for attribute values
trust/tests/test-data.c | 154 ++++++++++++++++++++++++----------------------
trust/tests/test-data.h | 32 +++++++++-
trust/tests/test-module.c | 13 ++--
trust/tests/test-parser.c | 11 ++--
4 files changed, 124 insertions(+), 86 deletions(-)
commit e46c74aef6eee7da3cdfb17077905811b9e04a61
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-19
Add tool for testing how fast the token loads
trust/tests/Makefile.am | 1 +
trust/tests/frob-token.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
commit 83af40091fdc50a1da21d6cd2582ecef759bfb7c
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Some debug info about which files are being loaded
trust/token.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
commit 1f47fbffe1befb30a1bd3dfcec079a8a9f2fd957
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Test a TRUSTED CERTIFICATE without any trust OIDs
build/certs/Makefile.am | 2 ++
build/certs/redhat-newca.der | Bin 0 -> 948 bytes
trust/tests/files/distrusted.pem | 23 +++++++++++++++++++++++
trust/tests/test-parser.c | 15 +++++++++++++++
4 files changed, 40 insertions(+)
commit 75654253498993ff1638e0e64440c335b54df1db
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Add the builtin roots NSS specific object
This tells NSS that this is a source of anchors.
doc/p11-kit-trust.xml | 5 ++++-
trust/tests/test-module.c | 27 +++++++++++++++++++++++++++
trust/tests/test-token.c | 6 +++---
trust/token.c | 28 +++++++++++++++++++++++++++-
4 files changed, 61 insertions(+), 5 deletions(-)
commit c2dcd0b3cb1ccac4eff98044d43d3f8696094644
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Add support for openssl TRUSTED CERTIFICATE PEM files
build/certs/Makefile.am | 3 +
common/Makefile.am | 2 +
common/openssl.asn | 28 ++++
common/openssl.asn.h | 28 ++++
doc/p11-kit-trust.xml | 8 ++
trust/parser.c | 244 ++++++++++++++++++++++++++++------
trust/tests/files/cacert3-trusted.pem | 43 ++++++
trust/tests/test-parser.c | 52 ++++++++
8 files changed, 368 insertions(+), 40 deletions(-)
commit a286df75050db8b306685cb22e491d11be842584
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Add support for parsing PEM files
build/certs/Makefile.am | 1 +
common/Makefile.am | 2 +
common/base64.c | 192 +++++++++++++++++++++++++++++++
common/base64.h | 53 +++++++++
common/pem.c | 241 +++++++++++++++++++++++++++++++++++++++
common/pem.h | 50 +++++++++
common/tests/Makefile.am | 14 ++-
common/tests/test-pem.c | 254 ++++++++++++++++++++++++++++++++++++++++++
trust/Makefile.am | 3 +-
trust/parser.c | 38 +++++++
trust/tests/files/cacert3.pem | 42 +++++++
trust/tests/test-parser.c | 26 +++++
12 files changed, 910 insertions(+), 6 deletions(-)
commit 5147d71466455b3d087b3f3a7472a35e8216c55a
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-24
Add basic trust module
This is based off the roots-store from gnome-keyring and loads
certificates from a root directory and exposes them as PKCS#11
objects.
Makefile.am | 7 +
build/Makefile.am | 2 +
build/certs/Makefile.am | 27 +
build/certs/cacert-ca.der | Bin 0 -> 1857 bytes
build/certs/cacert3.der | Bin 0 -> 1885 bytes
build/certs/self-server.der | Bin 0 -> 396 bytes
build/certs/self-signed-with-eku.der | Bin 0 -> 480 bytes
build/certs/self-signed-with-ku.der | Bin 0 -> 501 bytes
build/certs/testing-ca.der | Bin 0 -> 970 bytes
build/certs/testing-server.der | Bin 0 -> 554 bytes
build/certs/with-eku.conf | 19 +
build/certs/with-ku.conf | 19 +
common/Makefile.am | 15 +-
common/compat.c | 107 ++
common/compat.h | 17 +-
common/debug.c | 1 +
common/debug.h | 11 +
common/pkix.asn | 566 ++++++++
common/pkix.asn.h | 408 ++++++
common/tests/Makefile.am | 20 +-
common/tests/frob-cert.c | 147 ++
common/tests/frob-eku.c | 101 ++
common/tests/frob-ku.c | 134 ++
configure.ac | 128 +-
doc/Makefile.am | 2 +
doc/p11-kit-config.xml | 10 +
doc/p11-kit-devel.xml | 24 +
doc/p11-kit-docs.sgml | 1 +
doc/p11-kit-trust.xml | 90 ++
doc/style.css | 6 +-
p11-kit/Makefile.am | 1 +
p11-kit/conf.c | 37 -
p11-kit/p11-kit-1.pc.in | 3 +
trust/Makefile.am | 52 +
trust/module.c | 1517 +++++++++++++++++++++
trust/module.h | 42 +
trust/p11-kit-trust.module | 6 +
trust/parser.c | 1103 +++++++++++++++
trust/parser.h | 108 ++
trust/session.c | 206 +++
trust/session.h | 78 ++
trust/tests/Makefile.am | 44 +
trust/tests/anchors/cacert3.der | Bin 0 -> 1885 bytes
trust/tests/anchors/testing-ca.der | Bin 0 -> 970 bytes
trust/tests/certificates/cacert-ca.der | Bin 0 -> 1857 bytes
trust/tests/certificates/self-signed-with-eku.der | Bin 0 -> 480 bytes
trust/tests/certificates/self-signed-with-ku.der | Bin 0 -> 501 bytes
trust/tests/files/cacert-ca.der | Bin 0 -> 1857 bytes
trust/tests/files/cacert3.der | Bin 0 -> 1885 bytes
trust/tests/files/self-server.der | Bin 0 -> 396 bytes
trust/tests/files/testing-server.der | Bin 0 -> 554 bytes
trust/tests/files/unrecognized-file.txt | 1 +
trust/tests/test-data.c | 128 ++
trust/tests/test-data.h | 220 +++
trust/tests/test-module.c | 331 +++++
trust/tests/test-parser.c | 315 +++++
trust/tests/test-session.c | 160 +++
trust/tests/test-token.c | 106 ++
trust/token.c | 256 ++++
trust/token.h | 51 +
60 files changed, 6580 insertions(+), 47 deletions(-)
commit 603c7d4eb996f51178ccc9d235597497bbb2c7a4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-24
Add basic checksum algorithms
The SHA-1 and MD5 digests here are used for checksums in legacy
protocols. We don't use them in cryptographic contexts at all.
These particular algorithms would be poor choices for that.
.gitignore | 4 +-
common/Makefile.am | 9 +
common/checksum.c | 542 +++++++++++++++++++++++++++++++++++++++++++
common/checksum.h | 60 +++++
common/tests/Makefile.am | 2 +
common/tests/test-checksum.c | 151 ++++++++++++
6 files changed, 766 insertions(+), 2 deletions(-)
commit f6db686846480e0611879c5f4751955a53859808
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Remove the unused err() function and friends
We want to use p11_message in our commands anyway, since that
allows us control with --verbose and --quiet.
common/compat.c | 164 --------------------------------------------------------
common/compat.h | 23 --------
2 files changed, 187 deletions(-)
commit 1ac3edf711b1cdb5e7fb8b1d6321fa855e07c1da
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Tweak style of the manual
* Unindent the main headings
* Don't wrap options
* Better spacing in table of contents
* Don't have line numbers on code examples
doc/Makefile.am | 5 ++++-
doc/p11-kit-devel.xml | 4 ----
doc/p11-kit.xml | 2 --
doc/style.css | 23 +++++++++++++++++++++++
4 files changed, 27 insertions(+), 7 deletions(-)
commit 866e3204cee593817850f5e5c23a0bcf7af9c591
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Add documentation about contributing to p11-kit
HACKING | 34 ++------
doc/Makefile.am | 2 +-
doc/p11-kit-config.xml | 4 +-
doc/p11-kit-devel.xml | 223 +++++++++++++++++++++++++++++++++++++++++++++++++
doc/p11-kit-docs.sgml | 13 +--
doc/p11-kit-notes.xml | 48 -----------
6 files changed, 241 insertions(+), 83 deletions(-)
commit 28777eeebf38c13a43d0118a86391d2a487ad15b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Add a p11-kit tool manual page
.gitignore | 1 +
configure.ac | 4 ++
doc/Makefile.am | 33 +++++++++++++-
doc/p11-kit-docs.sgml | 5 +++
doc/p11-kit.xml | 122 ++++++++++++++++++++++++++++++++++++--------------
5 files changed, 130 insertions(+), 35 deletions(-)
commit 23b18cb345afe061274ff73cd66fe8e6672fbcd4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-02-05
Change the documentation configure arg to --enable-doc
* We're building more than just the gtk-doc reference
Makefile.am | 2 +-
configure.ac | 41 +++++++++++++++++++++++------------------
2 files changed, 24 insertions(+), 19 deletions(-)
commit 85751aa21dd9b93d8eb51e36767b5564ce6ce005
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-29
Add a /usr/share/p11-kit/modules directory for package module configs
* Try to make /etc/pkcs11/modules for administrator use
* Override the old pkg-config variables to help packages start
using the new location
configure.ac | 3 +++
doc/p11-kit-notes.xml | 4 ++--
p11-kit/Makefile.am | 4 ++++
p11-kit/conf.c | 8 ++++++--
p11-kit/conf.h | 3 ++-
p11-kit/modules.c | 4 +++-
p11-kit/p11-kit-1.pc.in | 13 +++++++------
p11-kit/tests/conf-test.c | 4 ++++
.../files/{system-modules => package-modules}/four.module | 0
.../{system-modules => package-modules}/win32/four.module | 0
10 files changed, 31 insertions(+), 12 deletions(-)
commit a9790a21302f47016a88ba9a2c904bed11efb388
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-29
Make the p11-kit tool have distinct commands
* Change the -l argument into the list-modules command.
* Add proper functions for printing usage
* Support for external commands in the path or /usr/share/p11-kit
tools/Makefile.am | 9 +-
tools/{p11-kit.c => list.c} | 99 +++++++------
tools/tool.c | 337 ++++++++++++++++++++++++++++++++++++++++++++
tools/tool.h | 56 ++++++++
4 files changed, 459 insertions(+), 42 deletions(-)
commit 15163fb9b7b03543da02d74d75d0f49c314f1c33
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-29
Add p11_kit_be_loud() function for use in tests and tools
This does the opposite of p11_kit_be_quiet().
doc/p11-kit-sections.txt | 1 +
p11-kit/p11-kit.h | 2 ++
p11-kit/util.c | 14 ++++++++++++++
3 files changed, 17 insertions(+)
commit cba41e5a46893b16cfbd845d55285894f4a43408
Author: Stef Walter <stefw@gnome.org>
Date: 2012-08-23
Add internal function for turning on messages
To be used from tests
common/library.c | 8 ++++++++
common/library.h | 2 ++
2 files changed, 10 insertions(+)
commit 43a3f5df8124bb85567feb18975d19fa1b639b9f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-24
Add more mock-module implementation
* Move mock code into the common/ directory to be used by multiple
components of p11-kit
common/Makefile.am | 5 +
common/mock.c | 3117 ++++++++++++++++++++++++++++++++++++++++
common/mock.h | 696 +++++++++
doc/Makefile.am | 3 +
p11-kit/tests/Makefile.am | 14 +-
p11-kit/tests/mock-module-ep.c | 4 +-
p11-kit/tests/mock-module.c | 898 ------------
p11-kit/tests/mock-module.h | 337 -----
p11-kit/tests/test-init.c | 4 +-
9 files changed, 3835 insertions(+), 1243 deletions(-)
commit 7ddff6795830deff6ec5fb1b8b0c704fbdea2c97
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-24
Further tweaks and cleanup for functions dealing with PKCS#11 attributes
* Check that the size is correct when looking for a boolean
or a ulong.
* Make sure that the length is not the invalid negative ulong.
* Functions for dumping out attribute contents
* Make it possible to use attributes in hash tables
common/attrs.c | 795 +++++++++++++++++++++++++++++++++++++++++++---
common/attrs.h | 59 +++-
common/tests/test-attrs.c | 126 +++++++-
3 files changed, 910 insertions(+), 70 deletions(-)
commit 322b4739cb51aa45568d9479224f2b07ac82a35f
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-24
Add generic buffer code
Represents a block of memory that can be added to, parsed and so on
common/Makefile.am | 1 +
common/buffer.c | 180 ++++++++++++++++++++++++++++++++++++++
common/buffer.h | 82 +++++++++++++++++
common/tests/Makefile.am | 1 +
common/tests/test-buffer.c | 214 +++++++++++++++++++++++++++++++++++++++++++++
p11-kit/uri.c | 93 ++++++++------------
6 files changed, 515 insertions(+), 56 deletions(-)
commit b28c936bd281c4b7ff9ed0f621b840f6d5a4b328
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-23
Use the stdbool.h C99 bool type
It was getting really wild knowing whether a function returning
an int would return -1 on failure or 0 or whether the int return
value was actually a number etc..
common/array.c | 16 +++---
common/array.h | 4 +-
common/attrs.c | 12 ++---
common/compat.h | 8 +++
common/debug.c | 8 +--
common/debug.h | 14 +++---
common/dict.c | 41 +++++++--------
common/dict.h | 26 +++++-----
common/library.c | 4 +-
common/tests/test-dict.c | 90 +++++++++++++++++----------------
configure.ac | 2 +-
p11-kit/conf.c | 58 +++++++++++-----------
p11-kit/conf.h | 6 +--
p11-kit/modules.c | 32 ++++++------
p11-kit/pin.c | 22 ++++-----
p11-kit/tests/conf-test.c | 19 +++++--
p11-kit/tests/mock-module.c | 14 +++---
p11-kit/tests/uri-test.c | 41 +++++++++++++--
p11-kit/uri.c | 118 ++++++++++++++++++++++++++------------------
tools/p11-kit.c | 10 ++--
20 files changed, 311 insertions(+), 234 deletions(-)
commit 4671352fe2a4f56c6707322dcab0015e2e8600c4
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-17
Only initialize p11-kit libraries once
* Make the gcc constructor call p11_library_init_once()
common/library.c | 14 ++++++++++----
common/library.h | 6 ++++--
2 files changed, 14 insertions(+), 6 deletions(-)
commit b39c9a7792824dfa8a05926261315356d9007098
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-10
Set strict debug preconditions during testing
common/tests/test-attrs.c | 4 ++++
p11-kit/tests/conf-test.c | 1 +
p11-kit/tests/pin-test.c | 1 +
p11-kit/tests/progname-test.c | 1 +
p11-kit/tests/test-init.c | 1 +
p11-kit/tests/test-modules.c | 1 +
p11-kit/tests/uri-test.c | 1 +
7 files changed, 10 insertions(+)
commit 3ebc9a78d4bca0b630a8b887ab93d6cc654f2cb2
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-07
Add common functions for manipulating CK_ATTRIBUTE arrays
common/Makefile.am | 1 +
common/attrs.c | 310 +++++++++++++++++++++++++++
common/attrs.h | 86 ++++++++
common/tests/Makefile.am | 1 +
common/tests/test-attrs.c | 518 ++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
p11-kit/tests/uri-test.c | 6 +-
p11-kit/uri.c | 207 +++++-------------
8 files changed, 977 insertions(+), 154 deletions(-)
commit 4a0bd25fcafae57ef2ae0cfe8676eee2332d5951
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-02
Move the pkcs11.h header files into common directory
* Allows use of them across the whole project
* Put a stub file in the p11-kit/ directory, so we can still refer
to the headers using that path, which is what it will be at
when in the installed includes directory.
common/Makefile.am | 7 +
common/pkcs11.h | 1373 +++++++++++++++++++++++++++++++++++++++++++++++++
common/pkcs11x.h | 155 ++++++
p11-kit/Makefile.am | 3 +-
p11-kit/pkcs11.h | 1413 ++-------------------------------------------------
5 files changed, 1577 insertions(+), 1374 deletions(-)
commit 8fb222266c5bf9181cd934c27528507d45476dad
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-08
Build common code into noinst libraries
* This is cleaner than building the same source files all over
the place over and over.
* Works better with code coverage.
common/Makefile.am | 12 ++++++++++--
common/tests/Makefile.am | 14 +++++---------
p11-kit/Makefile.am | 34 ++++++++--------------------------
p11-kit/tests/Makefile.am | 8 ++++++--
tools/Makefile.am | 12 ++++++++----
5 files changed, 37 insertions(+), 43 deletions(-)
commit 3d503948450d69293a3fdfec096e398fedf714f2
Author: Stef Walter <stefw@gnome.org>
Date: 2012-12-06
Move debug and library code into the common/ subdirectory
Start using p11_ as our internal prefix rather than _p11_. We explicitly
export p11_kit_ so this is fine as far as visibility.
Move the threading, mutex, and module compat, dict, and array code
into the common directory too.
Take this opportunity to clean up a bit of internal API as well,
since so many lines are being touched internally.
.gitignore | 32 ++-
Makefile.am | 13 +-
build/Makefile.am | 11 +
build/Makefile.tests | 8 +
{tests => build}/cutest/CuTest.c | 0
{tests => build}/cutest/CuTest.h | 0
{tests => build}/cutest/README.txt | 0
{tests => build}/cutest/license.txt | 0
{m4 => build/m4}/.empty | 0
common/Makefile.am | 11 +
p11-kit/ptr-array.c => common/array.c | 89 ++----
p11-kit/ptr-array.h => common/array.h | 35 ++-
common/compat.c | 95 ++++++
common/compat.h | 123 ++++++++
{p11-kit => common}/debug.c | 20 +-
{p11-kit => common}/debug.h | 74 ++---
p11-kit/hashmap.c => common/dict.c | 244 ++++++++--------
p11-kit/hashmap.h => common/dict.h | 101 +++----
common/library.c | 286 ++++++++++++++++++
common/library.h | 80 ++++++
common/tests/Makefile.am | 32 +++
common/tests/test-array.c | 194 +++++++++++++
tests/hash-test.c => common/tests/test-dict.c | 158 +++++-----
configure.ac | 7 +-
doc/Makefile.am | 11 +-
p11-kit/Makefile.am | 54 ++--
p11-kit/conf.c | 116 ++++----
p11-kit/conf.h | 14 +-
p11-kit/modules.c | 318 +++++++++++----------
p11-kit/pin.c | 78 ++---
p11-kit/private.h | 41 ---
p11-kit/proxy.c | 86 +++---
{tests => p11-kit/tests}/Makefile.am | 25 +-
{tests => p11-kit/tests}/conf-test.c | 201 ++++++-------
.../tests}/files/system-modules/four.module | 0
.../tests}/files/system-modules/one.module | 0
.../files/system-modules/two-duplicate.module | 0
.../tests}/files/system-modules/two.badname | 0
.../tests}/files/system-modules/win32/four.module | 0
.../tests}/files/system-modules/win32/one.module | 0
.../system-modules/win32/two-duplicate.module | 0
.../tests}/files/system-modules/win32/two.badname | 0
{tests => p11-kit/tests}/files/system-pkcs11.conf | 0
{tests => p11-kit/tests}/files/test-1.conf | 0
{tests => p11-kit/tests}/files/test-pinfile | 0
{tests => p11-kit/tests}/files/test-pinfile-large | 0
.../tests}/files/test-system-invalid.conf | 0
.../tests}/files/test-system-merge.conf | 0
.../tests}/files/test-system-none.conf | 0
.../tests}/files/test-system-only.conf | 0
.../tests}/files/test-user-invalid.conf | 0
{tests => p11-kit/tests}/files/test-user-only.conf | 0
{tests => p11-kit/tests}/files/test-user.conf | 0
.../tests}/files/user-modules/one.module | 0
.../tests}/files/user-modules/three.module | 0
.../tests}/files/user-modules/win32/one.module | 0
.../tests}/files/user-modules/win32/three.module | 0
{tests => p11-kit/tests}/mock-module-ep.c | 0
{tests => p11-kit/tests}/mock-module.c | 16 +-
{tests => p11-kit/tests}/mock-module.h | 0
{tests => p11-kit/tests}/pin-test.c | 4 +-
{tests => p11-kit/tests}/print-messages.c | 0
{tests => p11-kit/tests}/progname-test.c | 21 +-
{tests => p11-kit/tests}/test-init.c | 31 +-
{tests => p11-kit/tests}/test-modules.c | 25 +-
{tests => p11-kit/tests}/uri-test.c | 4 +-
p11-kit/uri.c | 6 +-
p11-kit/util.c | 318 ++-------------------
p11-kit/util.h | 158 ----------
tests/ptr-array-test.c | 257 -----------------
70 files changed, 1746 insertions(+), 1651 deletions(-)
commit c343f355b6abfe65adc696b57b18dc57c834acbc
Author: Pankaj Sharma <pankaj.cscience@gmail.com>
Date: 2012-12-24
Fix leak when initializing the proxy module
https://bugs.freedesktop.org/show_bug.cgi?id=58704
p11-kit/proxy.c | 2 ++
1 file changed, 2 insertions(+)
commit 8b4c3561d9681096d588d599d049a77bea68470b
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-09
Documentation fixes for PIN functions
p11-kit/pin.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit e8aa2fa8f3a085ca514e7b305ff91e2c77e5e6f4
Author: Pankaj Sharma <pankaj.cscience@gmail.com>
Date: 2012-12-24
Fix file descriptor leak in p11_kit_pin_file_callback()
* Close the file descriptor used to read the the pin file
https://bugs.freedesktop.org/show_bug.cgi?id=58706
p11-kit/pin.c | 2 ++
1 file changed, 2 insertions(+)
commit 488a466935d7995c803880ed258792f8a99095c0
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-08
Distribute HACKING in the tarball
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 6ac5af8deece74c383c912f2003b9650c87317b8
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-07
Fix documentation warnings.
* P11_KIT_URI_NO_MEMORY is an unexpected state, that will probably
never actually be returned. But kept for API compatibility.
* make distcheck doc fix
doc/Makefile.am | 2 +-
doc/p11-kit-sections.txt | 3 ++-
p11-kit/uri.c | 9 ++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
commit e2b5bba185c96bf4ecddfe22d34ace02706122b4
Author: Stef Walter <stefw@gnome.org>
Date: 2013-01-07
Guarantee that the key is freed when replaced
* When setting a key in a map that already exists, then free
the old key and replace with the new one.
* Fix related bug where key was not properly allocated
* Add tests for this
https://bugs.freedesktop.org/show_bug.cgi?id=59087
p11-kit/hashmap.c | 7 ++-
p11-kit/modules.c | 6 ++-
tests/hash-test.c | 124 +++++++++++++++++++++++++++++++++++++++---------------
3 files changed, 102 insertions(+), 35 deletions(-)
commit 1559a3e43637406c8b56e880ba00c96bdd16462c
Author: Stef Walter <stefw@gnome.org>
Date: 2012-11-14
Don't complain if we cannot access ~/.pkcs11/pkcs11.conf
* If a process is running under selinux it may not be able
to access the home directory of the uid that it is running as.
https://bugs.freedesktop.org/show_bug.cgi?id=57115
p11-kit/conf.c | 42 +++++++++++++++++++++++++++++++++---------
p11-kit/conf.h | 1 +
2 files changed, 34 insertions(+), 9 deletions(-)
commit b5de8e1d514794f6ec3e8d79a766a9dae9eab6ea
Author: Stef Walter <stefw@gnome.org>
Date: 2012-09-18
Refuse to load the p11-kit-proxy.so as a registered module
* Since p11-kit-proxy.so is a symlink to the libp11-kit.so library
we check that we are not calling into our known CK_FUNCTION_LIST
for the proxy code.
* Although such a configuration is invalid, detecting this directly
prevents strange initialization loop issues that are hard to debug.
https://bugs.freedesktop.org/show_bug.cgi?id=55052
p11-kit/modules.c | 14 ++++++++++----
p11-kit/private.h | 1 +
p11-kit/proxy.c | 7 ++-----
3 files changed, 13 insertions(+), 9 deletions(-)
commit 3e82c6182d913a3fd5cf904342a9a6fa44aef0d6
Author: Stef Walter <stefw@gnome.org>
Date: 2012-09-18
Don't fail initialization if last initialized module fails
* We weren't resetting the result code after a failure,
so even though failures for critical modules didn't interrupt
the initialization loop, the result still leaked to callers.
* Also print an error message clearly indicating that a module
failed to initialize, regardless of whether critical or not.
https://bugs.freedesktop.org/show_bug.cgi?id=55051
p11-kit/modules.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 37889e5f7ca5e2e45442f98dc84efb70d2acf907
Author: Stef Walter <stefw@gnome.org>
Date: 2012-09-06
Release version 0.14
NEWS | 8 ++++++++
configure.ac | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
commit bb6949da2fd071d879a13f8e24389fef697b451a
Author: Stef Walter <stefw@gnome.org>
Date: 2012-09-06
Change the default of 'user-config' to merge.
* This allows user configured PKCS#11 modules by default.
* Admins can change this to 'none' in /etc/pkcs11/pkcs11.conf
to go back to the previous behavior.
* Posted to the mailing list.
doc/p11-kit-config.xml | 4 ++--
p11-kit/conf.c | 2 +-
p11-kit/pkcs11.conf.example.in | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
commit 56860b7f72c444eed5923e11d735b85b630a171d
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: 2012-08-23
configure.ac: Fix bogus comma, and fix up spacing
* Fixes a mistake in the previous commit
https://bugs.freedesktop.org/show_bug.cgi?id=53706
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit 359bb15bc83484e4de69fa8dbc9113d97817d01e
Author: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: 2012-08-21
Use AC_LANG_PROGRAM to detect program_invocation_short_name functionality
Were erroneusly detecting program_invocation_short_name on OpenBSD
https://bugs.freedesktop.org/show_bug.cgi?id=53706
configure.ac | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit 61abcb61e8b8e988dd03cfd4553f29132a8ca38a
Author: Rob McMahon <Rob.McMahon@warwick.ac.uk>
Date: 2012-07-31
Fix build on solaris
* Conditional inclusion of the errno.h header
* Link librt when appropriate for nanosleep
https://bugs.freedesktop.org/show_bug.cgi?id=52261
common/compat.h | 4 ++++
configure.ac | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
commit 76180db6b326f8c87aef5b3eded9463432ce8d82
Author: Dan Winship <danw@gnome.org>
Date: 2012-07-27
Always encode the "id" attribute in URIs
Per recommendation of the spec.
https://bugs.freedesktop.org/show_bug.cgi?id=52606
p11-kit/uri.c | 24 ++++++++++++++----------
tests/uri-test.c | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
commit c6fc7b3ac4c6d4595f17989cff220d6d6dafe620
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Initialize mutexes correctly in mock module
https://bugzilla.gnome.org/show_bug.cgi?id=44740
tests/mock-module-ep.c | 1 +
tests/mock-module.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
commit 1f428d62a13e481aa51d1fcee0c4652dc9ef7a72
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Fix warning on windows
https://bugzilla.gnome.org/show_bug.cgi?id=44740
tests/conf-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 542cb48951b7c4c21ca3669d07bf936b0fa58b42
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Don't rely on loading order for duplicate modules
* We had relied on module 'two' loading before 'two-duplicate'
in the conf tests. However this isn't always the case, and the
name of the module can end up as 'two-duplicate'
https://bugzilla.gnome.org/show_bug.cgi?id=44740
tests/Makefile.am | 7 ++++++-
tests/files/system-modules/four.module | 3 +++
tests/files/system-modules/two.badname | 2 --
tests/files/system-modules/win32/four.module | 3 +++
tests/test-modules.c | 6 +++---
5 files changed, 15 insertions(+), 6 deletions(-)
commit 06595e93ff57e97adbb313aebc50a2e32acd6039
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Use Windows thread ids instead of handles for comparisons
* It seems that the HANDLE's returned from GetCurrentThread
are often equal for two threads. GetCurrentThreadID doesn't
have this problem.
* Separate our cross platform thread_t and thread_id_t types
even though on unix they're the same thing.
https://bugzilla.gnome.org/show_bug.cgi?id=44740
p11-kit/modules.c | 6 +++---
p11-kit/util.h | 11 ++++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
commit 356377709cd1de1308d9d8cf15f528578a360cf3
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Use correct shared library extension on windows
* The windows shared libraries have the .dll extension
* This means we also need separate directories for the test module
configs on win32
https://bugzilla.gnome.org/show_bug.cgi?id=44740
configure.ac | 4 ++++
p11-kit/Makefile.am | 14 ++++++++++++++
tests/files/system-modules/win32/one.module | 3 +++
tests/files/system-modules/win32/two-duplicate.module | 3 +++
tests/files/system-modules/win32/two.badname | 5 +++++
tests/files/user-modules/win32/one.module | 2 ++
tests/files/user-modules/win32/three.module | 5 +++++
tests/test-init.c | 2 +-
8 files changed, 37 insertions(+), 1 deletion(-)
commit f10d361a5b523ce7f9289ba8d45ccd847510d619
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-16
Use '.module' extension on module configs
* And want alphanumeric/_.- filenames
* Currently this is just a warning, soon it will be enforced
* The name of a module does not include the extension
Andreas Metzler and Ubuntu both worked on this patch, and I've made
some more changes.
See https://bugs.launchpad.net/ubuntu/+source/p11-kit/+bug/911436
https://bugs.freedesktop.org/show_bug.cgi?id=52158
doc/p11-kit-config.xml | 7 ++-
p11-kit/conf.c | 56 ++++++++++++++++++++--
tests/conf-test.c | 23 ++++++---
tests/files/system-modules/{one => one.module} | 0
tests/files/system-modules/two | 5 --
.../{two-duplicate => two-duplicate.module} | 0
tests/files/system-modules/two.badname | 7 +++
tests/files/user-modules/{one => one.module} | 0
tests/files/user-modules/{three => three.module} | 0
tests/test-modules.c | 4 +-
10 files changed, 82 insertions(+), 20 deletions(-)
commit c0251b132cad98318be0565f676b9fa92dd1b8b4
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-24
Fix compiler warning about uninitialized variable
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 45c4936ba0d5e3de7813c47811b277bed1c71576
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-24
Don't use strict aliasing during compilation
* Due to the way in which we pass pointers of different types
to _p11_hash_iter_next()
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 5cd198107374ff1879767679d29df0ce78f9427f
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Fix getprogname() running under wine
* Wine uses normal slashes instead of backslashes on windows
common/compat.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
commit d51914b6483b7ddc806ee3861084aa98ee97a7fb
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-17
Use EFBIG as the error code when pin file is too large
* The previous EOVERFLOW was not supported on mingw
p11-kit/pin.c | 2 +-
tests/pin-test.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 4a6a685c03bd92566c1656f1af3662ca7deecefa
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-16
Don't define duplicate symbols
* clang was giving a build failure here.
tests/mock-module.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 023efacf30a7ae4ee5a76f909f973fa5058bb7b9
Author: Stef Walter <stefw@gnome.org>
Date: 2012-07-16
Release version 0.13
NEWS | 14 ++++++++++++++
configure.ac | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
commit 413ca6be40a4f9351f12030c791544edd5a52e16
Author: Stef Walter <stefw@gnome.org>
Date: 2012-06-29
Don't allow reading of pin files larger than 4096 bytes
* p11_kit_pin_file_callback() only returns pins up to 4096 bytes now
p11-kit/pin.c | 19 +++++++++------
tests/files/test-pinfile-large | 53 ++++++++++++++++++++++++++++++++++++++++++
tests/pin-test.c | 26 +++++++++++++++++++++
3 files changed, 91 insertions(+), 7 deletions(-)
commit da2606bfbbdbd36d5e42bf2acf614735dfc515d2
Author: Stef Walter <stefw@gnome.org>
Date: 2012-06-29
Win32 build fixes
* Remove unused functions
* Use getprogname() instead of calc_progname() which no longer exists
* Fix up exporting of functions in the mock module
common/compat.c | 11 +++++++----
configure.ac | 2 ++
p11-kit/util.c | 26 --------------------------
tests/mock-module-ep.c | 1 +
4 files changed, 10 insertions(+), 30 deletions(-)
commit 89602ce99feb7e8c5a37634c3f577532f82eddbd
Author: Stef Walter <stefw@gnome.org>
Date: 2012-06-27
tools: Don't barf when p11-kit -h
tools/p11-kit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 483db3ee5d0c0e92dd8ecd8bf0cbefaa6254b6eb
Author: Stef Walter <stefw@gnome.org>
Date: 2012-06-27
If a module is not marked 'critical' then ignore failure
* Ignore failure when initializing registered modules when
'critical' is not set on a module.
p11-kit/modules.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
commit 59774b11eb478cc714a6c5da937e89c6089fd833
Author: Stef Walter <stefw@gnome.org>
Date: 2012-06-08
Fix the flags in pin.h
* Due to a brain fart the P11_KIT_PIN_* flags were not
bit flags but decimal numbers.
* This necessarily breaks API/ABI for users of the
P11_KIT_PIN_FLAGS_RETRY, P11_KIT_PIN_FLAGS_MANY_TRIES and
P11_KIT_PIN_FLAGS_FINAL_TRY flags. But those wouldn't have
worked anyway.
p11-kit/pin.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
commit caa953cba4d2d0cdd4823eb2f1c4f24bbf18a231
Author: Stef Walter <stefw@gnome.org>
Date: 2012-05-13
Preconditions to check for input probs and out of memory
* We don't try to guarantee completely robust and problem
free behavior in cases where the caller or process isn't
behaving. We consider these to be outside of our control.
HACKING | 31 ++++++++++++
p11-kit/conf.c | 76 +++++++++---------------------
p11-kit/debug.c | 19 ++++++++
p11-kit/debug.h | 30 ++++++++++++
p11-kit/modules.c | 85 +++++++++++++++++----------------
p11-kit/pin.c | 138 ++++++++++++++++++++++++++----------------------------
p11-kit/proxy.c | 27 ++++-------
p11-kit/uri.c | 112 ++++++++++++++++++++------------------------
p11-kit/uri.h | 4 +-
p11-kit/util.c | 9 ----
p11-kit/util.h | 2 -
tests/Makefile.am | 3 +-
tests/test-init.c | 68 ++++++++++++++++++++++++++-
tests/uri-test.c | 12 ++++-
14 files changed, 352 insertions(+), 264 deletions(-)
commit 7bd4114182fcc86cd2515708fdf4d76622e0237d
Author: Stef Walter <stefw@gnome.org>
Date: 2012-05-13
Use gcc extensions to check varargs during compile
* Add macros GNUC_PRINTF and GNUC_NULL_TERMINATED to check
correct printf and NULL terminated style varargs
common/compat.h | 24 ++++++++++++++++++------
p11-kit/conf.c | 11 ++++++++---
p11-kit/debug.h | 4 +++-
p11-kit/modules.c | 7 +++++--
p11-kit/private.h | 4 +++-
tests/Makefile.am | 1 +
6 files changed, 38 insertions(+), 13 deletions(-)
commit 14b0be4353e5c4464cb9f61e419a2f8caf8757d0
Author: Stef Walter <stefw@gnome.org>
Date: 2012-05-01
Fix test modules linking errors
* And display warning messages in the debug output
p11-kit/Makefile.am | 2 ++
p11-kit/util.c | 1 +
2 files changed, 3 insertions(+)
commit fed549ee2049a318081cfce3fde01ae625263d98
Author: Stef Walter <stefw@gnome.org>
Date: 2012-05-01
Provide compat getprogname() implementations on other OS's
* And use them in our replacement err() and p11_kit_set_progname()
common/compat.c | 87 +++++++++++++++++++++++++++++++++++++++--------------
common/compat.h | 10 ++++--
p11-kit/Makefile.am | 7 ++++-
p11-kit/util.c | 38 ++---------------------
tools/Makefile.am | 1 +
tools/p11-kit.c | 2 +-
6 files changed, 81 insertions(+), 64 deletions(-)
commit a3bcb9037ddf6657f79f0aae42aa83dd2b8f6b14
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-30
Move the compat.[ch] headers into common directory/
* And the compat stuff in the p11-kit directory merged
into util.c and util.h
{tools => common}/compat.c | 0
{tools => common}/compat.h | 0
p11-kit/Makefile.am | 3 +-
p11-kit/compat.c | 114 ----------------------------------
p11-kit/compat.h | 149 ---------------------------------------------
p11-kit/conf.c | 2 +-
p11-kit/debug.c | 1 -
p11-kit/private.h | 2 +-
p11-kit/util.c | 66 ++++++++++++++++++++
p11-kit/util.h | 111 +++++++++++++++++++++++++++++++++
tests/mock-module.c | 2 +-
tests/test-init.c | 2 +-
tools/Makefile.am | 3 +-
tools/p11-kit.c | 4 +-
14 files changed, 186 insertions(+), 273 deletions(-)
commit eeb40dccb63682367e03f52750355bf5951edff7
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-16
Doc tweaks for PIN functionality
p11-kit/pin.c | 47 ++++++++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 19 deletions(-)
commit 85f9d306832964f6d6412392f335e1fa3f3efd8b
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-02
Add tests for enable-in and disable-in
p11-kit/Makefile.am | 8 +--
p11-kit/modules.c | 4 +-
tests/Makefile.am | 4 +-
tests/conf-test.c | 16 ++---
tests/files/system-modules/two | 4 +-
tests/files/system-pkcs11.conf | 3 +
tests/files/user-modules/three | 4 +-
tests/test-modules.c | 156 ++++++++++++++++++++++++++++++++++++++---
8 files changed, 171 insertions(+), 28 deletions(-)
commit d4c5661a695b5fc4a0126a4583e30ef70aea54ac
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-02
Build some test modules for testing main p11-kit functionality
* And put together a test for duplicate modules
p11-kit/Makefile.am | 29 ++++++--
tests/Makefile.am | 32 +++++++--
tests/conf-test.c | 16 ++---
tests/files/system-modules/one | 2 +-
tests/files/system-modules/two | 2 +-
tests/files/system-modules/two-duplicate | 3 +
tests/files/user-modules/three | 2 +-
tests/mock-module-ep.c | 50 ++++++++++++++
tests/test-modules.c | 111 +++++++++++++++++++++++++++++++
9 files changed, 225 insertions(+), 22 deletions(-)
commit c43038d82edcfd878ff66e3aa7fe247f53876f9b
Author: Stef Walter <stefw@gnome.org>
Date: 2012-02-27
Add more p11-kit cleanup to fix valgrind leak reports
* per-thread memory isn't actually a real memory leak, but was
still reachable after exit, so clean this up.
p11-kit/util.c | 11 +++++++++++
1 file changed, 11 insertions(+)
commit ff9926b8dcead91e7fc6d08d0ca1d2d8cc982308
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-01
Fix crasher when a duplicate module is present
p11-kit/modules.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
commit a899d9be0cab72dcfe00f100527c52ea598fed70
Author: Stef Walter <stefw@gnome.org>
Date: 2012-04-01
Add enable-in and disable-in options to module config
* These can be used to load certain modules in certain
programs, or prevent loading in others.
* Useful for a key manager like seahorse, so we can load
extra modules (think NSS) that other modules shouldn't
load.
.gitignore | 2 +
configure.ac | 12 ++++-
doc/p11-kit-config.xml | 27 +++++++++++
doc/p11-kit-sections.txt | 1 +
p11-kit/modules.c | 75 ++++++++++++++++++++++++++++++-
p11-kit/p11-kit.h | 2 +
p11-kit/private.h | 4 ++
p11-kit/util.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++-
tests/Makefile.am | 2 +
tests/progname-test.c | 110 +++++++++++++++++++++++++++++++++++++++++++++
10 files changed, 346 insertions(+), 4 deletions(-)
commit af8d28014f97ab0d9e4d00961e72aefd7adb470b
Author: Stef Walter <stefw@gnome.org>
Date: 2012-03-27
Fix broken hashmap behavior
* We were relying on undefined gcc behavior related to the &
operator.
* This would show up as a test failure when running with -O2 on
certain GCC versions, as well as failure on clang 3.1
p11-kit/hashmap.c | 12 +++++-------
tests/hash-test.c | 2 --
2 files changed, 5 insertions(+), 9 deletions(-)
commit f40f63c2b608a399df431df366bf681e6b2bb20e
Author: Stef Walter <stefw@gnome.org>
Date: 2012-03-19
Remove p11-kit.pot file from git
* Generated automatically
.gitignore | 1 +
po/p11-kit.pot | 343 ---------------------------------------------------------
2 files changed, 1 insertion(+), 343 deletions(-)
commit bbd0c4dcde10197df1473ffc5641cafe2173a676
Author: Stef Walter <stefw@gnome.org>
Date: 2012-03-09
Release version 0.12
NEWS | 3 +++
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 300c84133390363a543854e5cd0ac3dd9018544e
Author: Simon Josefsson <simon@josefsson.org>
Date: 2012-03-08
Fix build problem due to pthread extensions usage
See: http://ipozgaj.blogspot.com/2006/08/posix-threads-and-manual-pages-rant.htm
configure.ac | 1 +
1 file changed, 1 insertion(+)
commit 632e268fa86ad8ba55d34044ccc325c20c8fc0c7
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2012-02-07
Release 0.11
NEWS | 3 +++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
commit 53c34e8ff80500d6ef9366453e88c27a3a52ee46
Author: Stef Walter <stefw@gnome.org>
Date: 2012-01-23
Remove automatic reinitialization of PKCS#11 after fork
* First of all one should only call async-signal-safe functions
from the callbacks of pthread_atfork(), and so we cannot
reinitialize directly.
* Some modules use pthread_atfork() to detect forking and setup
their internal state. If we call into them in our pthread_atfork()
callback then this is inherently racy.
* There was danger of endless loops and deadlocks which are caused
by handlers which fork in their C_Initialize
* Many processes do fork/exec, reinitializing PKCS#11 for these
forks is quite resourc intensive when the child process won't use
PKCS#11 at all.
p11-kit/modules.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
commit 001d59596a37369d094edcace455f611d9f55908
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2012-01-03
Release version 0.10
NEWS | 3 +++
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 049e556d043aa6ecfbf32a70dae6e7e5e8eb69d3
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2012-01-02
Fix build warning on mingw64
p11-kit/hashmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 83dcc15d1d97218004137769ff68e2e8119f1d80
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2011-12-23
Compile CuTest.c separately.
Use regular compile and link instead of having #include "CuTest.c" in
every test. Works around gcc optimization issue.
tests/Makefile.am | 10 +++++++++-
tests/conf-test.c | 2 --
tests/hash-test.c | 2 --
tests/pin-test.c | 2 --
tests/ptr-array-test.c | 2 --
tests/test-init.c | 2 --
tests/uri-test.c | 2 --
7 files changed, 9 insertions(+), 13 deletions(-)
commit 2da833b0ca9539c12745d2f9fef1e7be7c7792dc
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-12-20
Reorganize tests, work around optimization bug
* Encountered a gcc optimization bug in gcc 4.6.1 which seems to
be reordering related function calls eroneously. This bug seems
to be fixed in 4.6.2.
* Reorganize test code to get around this bug building on mingw,
and ubuntu 11.10, both of which use gcc 4.6.1
tests/hash-test.c | 45 ++++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
commit 9328bb7f0aed047dea47e8674e19865d90d423a5
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2011-12-09
Run tests correctly in automake
* This allows failing tests to stop the build
tests/Makefile.am | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
commit 336d8af58ea3d00a20a56937b11236a6bf2679dd
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2011-11-25
Build fix for MinGW w64
p11-kit/compat.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit e18725f71e0f070a54d763cbba7797031828dd95
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-14
Release version 0.9
NEWS | 6 ++++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
commit d3dfc6968e54b919c90967a486d20066b0f5bf57
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-02
Reduce autofoo dependencies
* automake 1.10 (although can benefit from some 1.11 features)
* autoconf 2.61
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9ccc74f384ee100ec522e012ea543437b1df123c
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-01
An intelligent error message when gettextize is not around
autogen.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 7370d64c18b795a63eda40efcc9e786b821cb7f7
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-30
p11-kit can't be used as a static library
* It just doesn't make sense.
* The initialization refcounting in particular can only work as
a shared library.
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
commit df0ed92f44fa168c0d02866796f3707687f43214
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-29
Fix problems crashing when freeing TLS on windows
p11-kit/util.c | 2 ++
1 file changed, 2 insertions(+)
commit 922d53016955c0ff2d6d830d726f0d1ea3a5804b
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-29
Add debug output to windows init and uninit of library
p11-kit/util.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit c940667c434fe64cf4d01cec0873044c54e7f174
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-29
Make build not depend on gtk-doc or pkg-config
* If enabled, gtk-doc can be used, but we no longer expect the
gtkdoc autoconf/automake macro files to be installed.
* pkg-config is no longer used for checks.
* We still do install pkg-config files, and this is the preferred
way to build against and link to p11-kit.
configure.ac | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
commit 0792fefb2bc9d5db038b48855f0b1bb138653332
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-29
Handle build case when gettextize is not available or not installed
autogen.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
commit 969bcab592878322e410f4342a61fccc06b9addd
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-27
Fix build with clang
* Just removed some unused functions that used GNUC extensions
tests/cutest/CuTest.c | 10 ----------
tests/cutest/CuTest.h | 5 -----
2 files changed, 15 deletions(-)
commit 77bab108dd2a7d1c55468cc991c22397fb5f8ba5
Author: Dr. Volker Zell <dr.volker.zell@oracle.com>
Date: 2011-10-25
Fix broken build on cygwin and mingw
* Add correct linking options for libintl
p11-kit/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
commit 69f7eaa0508326f07832b91557f9e1ad8e6864c6
Author: Michael Cronenworth <mike@cchtml.com>
Date: 2011-10-25
Fix broken build on windows
* The debug_init() call needed a rename to _p11_debug_init() to match
the non-Win32 code.
p11-kit/util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 190aee9cdf44d257333d7ef9e29113a07f1516c9
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-24
Release version 0.8
NEWS | 7 +++++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
commit 138c046a5ff1b0e532896b4d640c0cba6ead4027
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-24
More fixes for non-static function names
* See previous commit
* Initialize library before debug statements
p11-kit/conf.c | 8 +++----
p11-kit/debug.c | 7 -------
p11-kit/debug.h | 16 +++++++-------
p11-kit/modules.c | 62 +++++++++++++++++++++++++++----------------------------
p11-kit/proxy.c | 14 ++++++++-----
p11-kit/uri.c | 2 +-
6 files changed, 53 insertions(+), 56 deletions(-)
commit 5507dc4946f0a68cece5ec9e7096e0f9b8c55984
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-24
Rename non-static functions to have a _p11_xxx prefix.
* Work around issues with brain-dead linkers not respecting
the libtool -export-symbol-regex argument
https://bugs.freedesktop.org/show_bug.cgi?id=42020
p11-kit/compat.c | 8 +--
p11-kit/compat.h | 48 +++++++--------
p11-kit/conf.c | 36 +++++------
p11-kit/debug.c | 17 +++---
p11-kit/debug.h | 12 ++--
p11-kit/hashmap.c | 68 +++++++++++++--------
p11-kit/hashmap.h | 63 +++++++++----------
p11-kit/modules.c | 110 ++++++++++++++++-----------------
p11-kit/pin.c | 40 ++++++------
p11-kit/private.h | 4 +-
p11-kit/proxy.c | 18 +++---
p11-kit/ptr-array.c | 28 +++++----
p11-kit/ptr-array.h | 14 ++---
p11-kit/uri.c | 2 +-
p11-kit/util.c | 12 ++--
p11-kit/util.h | 2 +-
tests/conf-test.c | 140 +++++++++++++++++++++---------------------
tests/hash-test.c | 162 ++++++++++++++++++++++++-------------------------
tests/mock-module.c | 10 +--
tests/ptr-array-test.c | 122 ++++++++++++++++++-------------------
tests/test-init.c | 22 +++----
tests/uri-test.c | 5 +-
22 files changed, 484 insertions(+), 459 deletions(-)
commit db92b76e3acb11e330309ebce071ec2e61400a71
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-17
Initial port to win32
* Tests do not all yet pass, at least not on wine
* Added abstraction of some non-portable functions in compat.h/c
* Build with an argument like this for win32 support:
./autogen.sh --host=i586-mingw32msvc
* This win32 port needs more work from interested parties
.gitignore | 3 +
configure.ac | 35 ++++++--
doc/Makefile.am | 2 +-
p11-kit/Makefile.am | 1 +
p11-kit/compat.c | 114 ++++++++++++++++++++++++++
p11-kit/compat.h | 143 ++++++++++++++++++++++++++++++++
p11-kit/conf.c | 64 ++++++++++-----
p11-kit/debug.c | 31 +++----
p11-kit/debug.h | 2 +
p11-kit/modules.c | 104 +++++++++++-------------
p11-kit/private.h | 40 +++++++--
p11-kit/proxy.c | 7 +-
p11-kit/util.c | 188 +++++++++++++++++++++++++++++++++++--------
tests/Makefile.am | 16 ++--
tests/conf-test.c | 2 +
tests/mock-module.c | 20 +++--
tests/mock-module.h | 1 +
tests/pin-test.c | 3 +
tests/test-init.c | 56 +++++++------
tools/Makefile.am | 4 +
tools/compat.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tools/compat.h | 63 +++++++++++++++
tools/p11-kit.c | 5 +-
23 files changed, 952 insertions(+), 180 deletions(-)
commit b1d9fd5f88ade222fbd2206c7e11c5514c8b5634
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-10
Fix up the build options.
* --enable-debug turns off optimization
* --disable-debug turns off debugging output, debug symbols
* --enable-strict turns on -Werror
configure.ac | 123 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 66 insertions(+), 57 deletions(-)
commit 73880f950a7dadf712730222ac1b6ea11400746f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-10
Only call C_Initialize and C_Finalize once per module
* Do not concurretnly call C_Initialize or C_Finalize in a module
* The PKCS#11 spec indicates that mone thread should call those functions.
* It's reasonable for a module to expect to only be initialized or
finalized in one thread.
* In particular NSS does not lock its C_Initialize or C_Finalize.
p11-kit/modules.c | 117 ++++++++++++++++++++++++++++------------------------
tests/mock-module.c | 4 +-
tests/test-init.c | 105 +++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 168 insertions(+), 58 deletions(-)
commit 630ce95d7b9ec3ac3cbe71f75910711369274314
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-10
Combine initialization tests
tests/Makefile.am | 14 ++----
tests/{test-fork.c => test-init.c} | 34 ++++++++++++-
tests/test-recursive.c | 98 --------------------------------------
3 files changed, 36 insertions(+), 110 deletions(-)
commit d5a004ded8a0acdb7aa2100b8e116f19d0d9e402
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-10
Don't allow recursive calling of C_Initialize on a given module.
p11-kit/modules.c | 9 ++++-
tests/Makefile.am | 10 ++++--
tests/test-recursive.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 114 insertions(+), 3 deletions(-)
commit 591c1c14f2ebbcbc3f621456e31e2af1d26820b8
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-10
Rename p11-kit test
.gitignore | 2 ++
tests/Makefile.am | 6 +++---
tests/{p11-test.c => test-fork.c} | 0
3 files changed, 5 insertions(+), 3 deletions(-)
commit 85d9078be0456de8014a6f186f3916ddb01792d2
Author: Pino Toscano <pino@debian.org>
Date: 2011-09-30
Don't use PATH_MAX unless its defined
* Fixes build on GNU/Hurd
https://bugs.freedesktop.org/show_bug.cgi?id=41303
p11-kit/modules.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
commit 639aa9e38692ba5001987bb496e10cca14880807
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-28
Print more information in 'p11-kit -l'
tools/p11-kit.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
commit 67b52ed7d7f298f64be5ead41deeeebab1238d47
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-27
Release 0.7
NEWS | 5 +++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
commit d3e245f579d917d1393624b6ecf3ae0c3748bbb3
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-27
Don't expand p11-kit config variables in configure.
* Expand them later in Makefile and pkg-config file
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit fcb71c3962314b48e9f8bd7f82673fa4e065607d
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-26
Add test tool to print out error messages
* Allows checking of translations
.gitignore | 1 +
tests/Makefile.am | 3 +-
tests/print-messages.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 140 insertions(+), 1 deletion(-)
commit a1cc80045864777db8c77e711f0a8efaad949c3e
Author: Andreas Metzler <ametzler@downhill.at.eu.org>
Date: 2011-09-26
Fix quoting of build variables
https://bugs.freedesktop.org/show_bug.cgi?id=40985
p11-kit/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit a081b6652acc9d9a9af22a266f9175f689b8c5d1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-19
Expand the libdir path correctly
https://bugs.freedesktop.org/show_bug.cgi?id=40985
configure.ac | 6 ------
p11-kit/Makefile.am | 9 ++++++++-
2 files changed, 8 insertions(+), 7 deletions(-)
commit 8054865325fdb2221f3e425d04d9e03f6475553e
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2011-09-15
Add #include <limits.h> for PATH_MAX to fix compilation on FreeBSD.
https://bugs.freedesktop.org/show_bug.cgi?id=40923
p11-kit/modules.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 67dc760cec1653e9571b7c4e2bada3992c2b8361
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-14
Release version 0.6
NEWS | 5 +++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
commit 11f3f0effb14be788e320d2f75b0d2d769058966
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-09-14
Add documentation about the configuration paths
* Default module path
* How to lookup paths using pkg-config
doc/p11-kit-config.xml | 37 ++++++++++++++++++++++---------------
doc/p11-kit-docs.sgml | 1 +
doc/p11-kit-notes.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
doc/p11-kit.xml | 3 +++
doc/style.css | 2 ++
5 files changed, 76 insertions(+), 15 deletions(-)
commit 927d2e5927ddad1eafe94c0bcadd76cd73d6297a
Author: Kalev Lember <kalevlember@gmail.com>
Date: 2011-09-14
When a module has a relative path, load it from $libdir/pkcs11
So far we have only supported full paths to the pkcs11 modules in config
files. This change adds relative path support, so that for modules
installed under the standard $libdir/pkcs11, the config file won't have
to spell out the full path.
configure.ac | 9 ++++++++
p11-kit/modules.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++---
p11-kit/p11-kit-1.pc.in | 1 +
3 files changed, 68 insertions(+), 3 deletions(-)
commit 138c1efa9af4893536fb7c3a90d3cb1ac24cea89
Author: Kalev Lember <kalevlember@gmail.com>
Date: 2011-09-14
Rename pkgconfig configuration directory variables
Renamed them to reduce ambiguity and to pave the way for exposing
some additional parameters.
p11_system_modules -> p11_system_config_modules
p11_user_modules -> p11_user_config_modules
configure --with-pkcs11-dir
=>
configure --with-system-config
configure.ac | 50 ++++++++++++++++++++++--------------------
p11-kit/Makefile.am | 2 +-
p11-kit/modules.c | 5 +++--
p11-kit/p11-kit-1.pc.in | 10 +++++----
p11-kit/pkcs11.conf.example.in | 2 +-
5 files changed, 37 insertions(+), 32 deletions(-)
commit 1cecad87a968ab6441b020fafb95f991b97e84b3
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-31
Release version 0.5
NEWS | 5 +++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
commit e06009c33616d07a0687d0adbb5c59ec1c8965af
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-30
Don't crash if p11_kit_registered_modules() called after failed init
p11-kit/modules.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit fbdb10edfa39ada801af187dd3abaa5c8bf2ae6b
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-30
Remove useless typedef
p11-kit/conf.h | 2 --
1 file changed, 2 deletions(-)
commit 21b64c68e6a5ffcae50f3561f6dec6ee943a006f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-30
Add 'critical' setting for modules
* When a module has critical set to 'yes', and that module fails to init
then it aborts the entire init process.
* Defaults to 'no'
doc/p11-kit-config.xml | 24 ++++++++++++++++++++++--
p11-kit/conf.c | 18 ++++++++++++++++++
p11-kit/conf.h | 3 +++
p11-kit/modules.c | 7 ++++++-
4 files changed, 49 insertions(+), 3 deletions(-)
commit 25512ca5a03d723a84d6de67a7036188d08ec21b
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-24
Fix bugs in the p11-kit proxy module.
* Initialize the mappings properly
* Lookup session handles correctly
* Debug initialization and finalization
p11-kit/debug.c | 1 +
p11-kit/debug.h | 3 ++-
p11-kit/proxy.c | 42 ++++++++++++++++++++++++++++--------------
3 files changed, 31 insertions(+), 15 deletions(-)
commit 61c925fda7385392b3961f0b44049b9ff7a68093
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-19
Release version 0.4
NEWS | 8 ++++++++
configure.ac | 2 +-
po/p11-kit.pot | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
commit ae95625311e98caa3cccf82d24a3b612df11b26d
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-19
Ignore spaces in PKCS#11 URIs
* These should be able to occur anywhere and should be ignored
according to RFC 3986. This is documented in the PKCS#11 URI
specification.
p11-kit/uri.c | 85 ++++++++++++++++++++++++++++++++++++++++++--------------
p11-kit/uri.h | 4 +--
tests/uri-test.c | 24 ++++++++++++++++
3 files changed, 90 insertions(+), 23 deletions(-)
commit d4abb441450deceff760086dcdf9d493b258074a
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-14
Fix endless loop if module forks during initialization.
* If a module forks during its C_Initialize, previously our
fork handler would try to initialize it again, ad nauseum.
Reported by Nikos on the mailing list.
.gitignore | 1 +
p11-kit/modules.c | 12 +-
tests/Makefile.am | 30 +-
tests/mock-module.c | 886 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/mock-module.h | 336 ++++++++++++++++++++
tests/p11-test.c | 114 +++++++
6 files changed, 1354 insertions(+), 25 deletions(-)
commit 43169c520292397439bd70fb74e9505d371f7c72
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-14
Safer initialization of individually initialized module.
* More checks for out of memory.
* Take more of the same code paths when initializing a single
module as when initializing registered, or loading from file.
* Cleanup halfway initialized globals if fail during init.
p11-kit/modules.c | 36 ++++++++++++++++++++++++++++++------
1 file changed, 30 insertions(+), 6 deletions(-)
commit 1e2011a308500632a9fbfb541dafcd73d796f3d5
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-05
Update PKCS#11 URI code for new draft of spec
* pinfile attribute was renamed to pin-source
* objecttype attribute was renamed to object-type
* secretkey value was renamed to secret-key
We continue to support parsing the old attribute names and values but
generate URIs with the new ones.
doc/Makefile.am | 2 +-
doc/p11-kit-sections.txt | 2 +
p11-kit/pin.c | 126 +++++++++++++++++++++++------------------------
p11-kit/pin.h | 10 ++--
p11-kit/uri.c | 83 +++++++++++++++++++++----------
p11-kit/uri.h | 9 ++++
tests/pin-test.c | 38 +++++++-------
tests/uri-test.c | 60 +++++++++++-----------
8 files changed, 185 insertions(+), 145 deletions(-)
commit 0a2fd044770d645b7707d2b4926a3214147973a8
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-03
Don't fail when duplicate modules are configured.
* Duplicate modules may be caused by editor backups, misconfigurations
or a multitude of other sources. Failing dead is a bit harsh.
* After discussing gnutls needs with Nikos
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3b78f626872c637339a3302b8f0607c778aef92c
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-03
Better debug output for initialization and loading modules.
p11-kit/modules.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
commit ca48cb81f8e1465fdc4e4b504ea9da0324b30658
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-03
Fix broken debug arguments
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e938d137fee800605b5c11d0c2aa6eae90e205eb
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-08-01
Add example configuration documentation.
* And also install example pkcs11.conf file.
.gitignore | 1 +
configure.ac | 7 ++++--
doc/p11-kit-config.xml | 48 ++++++++++++++++++++++++++++++++++++++++++
p11-kit/Makefile.am | 6 +++++-
p11-kit/pkcs11.conf.example.in | 9 ++++++++
5 files changed, 68 insertions(+), 3 deletions(-)
commit dd6b2c11794a74a33bfa53fec9892cb0c7007e80
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-29
Release version 0.3
NEWS | 5 +++++
README | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
commit 24d5da1bfa82e296872ae1ef62dbc073780edf20
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2011-07-28
Fix building with NLS enabled.
https://bugs.freedesktop.org/show_bug.cgi?id=39622
tests/Makefile.am | 17 +++++++++++------
tools/Makefile.am | 3 ++-
2 files changed, 13 insertions(+), 7 deletions(-)
commit 8f4923bcaa66809aa247859b48f2d67d8950097e
Author: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: 2011-07-28
Use AC_SEARCH_LIBS instead of AC_CHECK_LIB for dlopen() to fix on *BSD.
https://bugs.freedesktop.org/show_bug.cgi?id=39622
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b1b63063e0da8518e89b485bc4d2827ba2e3fdcf
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-28
Make p11-kit-proxy.so link point to libp11-kit.so.0.0.0
* The link now points to the actual library, rather than to
another link.
https://bugzilla.redhat.com/show_bug.cgi?id=725905
p11-kit/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit daec3faa85c4f463e3b13688f2bc2bbd1b2ae106
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-27
Add libtool style versioning variables to p11-kit
configure.ac | 16 ++++++++++++++++
p11-kit/Makefile.am | 4 +++-
po/p11-kit.pot | 4 ++--
3 files changed, 21 insertions(+), 3 deletions(-)
commit fb0952dbeb607542b7feab80b1bbd2b1258cd15f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-27
Fix bug in hashtable rewrite.
* Initialization mixup.
p11-kit/hashmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 9add486d5bbb2ac6a3566e21d729107c26de77a3
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-27
Cleanup documentation warnings
* After recent hash table rewrite we should be ignoring the new
file.
doc/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 4454fc36a0dd9b6e99e302769084b2964eef34c1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-27
Create a link for the proxy module.
* Install proxy module at its own path which is not prefixed by 'lib'
* Since the proxy module is the same as the library, and actually
needs to be loaded as the same library in memory (due to resource
tracking per process), use a symlink for proxy.
* Add a variable to the pkg-config file which shows the path
to the proxy module. ie:
$ pkg-config --variable=proxy_module p11-kit-1
https://bugzilla.redhat.com/show_bug.cgi?id=725905
p11-kit/Makefile.am | 6 +++++-
p11-kit/p11-kit-1.pc.in | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
commit 308a776372eb1560480fbfcb5ef9d918a7a1454f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-27
Reimplement and remove apache licensed bits of code.
* Reimplement the various bits of the hash table that were
still based on the apache apr code. Use different algorithms
for hashing, lookup and other stuff.
* Use this as an opportunity to cleanup that code and make
it more legible.
https://bugzilla.redhat.com/show_bug.cgi?id=725905
COPYING | 22 +-
p11-kit/Makefile.am | 2 +-
p11-kit/conf.c | 50 ++---
p11-kit/conf.h | 12 +-
p11-kit/hash.c | 473 ------------------------------------------
p11-kit/hashmap.c | 372 +++++++++++++++++++++++++++++++++
p11-kit/{hash.h => hashmap.h} | 71 +++----
p11-kit/modules.c | 62 +++---
p11-kit/pin.c | 6 +-
p11-kit/proxy.c | 8 +-
tests/conf-test.c | 64 +++---
tests/hash-test.c | 158 +++++++-------
12 files changed, 578 insertions(+), 722 deletions(-)
commit 3bb86b72ca5882b1e5684db837c75df810f283c3
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-21
Expand the various pkcs11 config paths properly.
* Without this the ${prefix} part of the variable wasn't being
expanded and was making it into the #define.
configure.ac | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 4a3a1e0b8ad676f057e4fb141b4692987e8ce558
Author: Colin Walters <walters@verbum.org>
Date: 2011-07-18
configure: Use $sysconfdir for p11_system_conf dir, not hardcoded /etc
If the user specified sysconfdir, we should respect it. Don't
hardcode /etc. This is important for jhbuild, which uses
/path/to/builddir/etc.
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 43cf13e1a25da76297cd3397569031d7c3fd3a09
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-19
Ignore some built files after recent changes.
.gitignore | 2 ++
m4/{empty => .empty} | 0
2 files changed, 2 insertions(+)
commit b59ab92e640e13d10484fffc74ed6a218930c6ab
Author: Colin Walters <walters@verbum.org>
Date: 2011-07-18
build: Make autogen.sh work
* We were missing a call to gettextize, which is what copies in config.rpath
* Delete ABOUT-NLS, it is copied in by gettextize
* While we're here, take a page from gtk+'s autogen.sh and just use autoreconf,
instead of specifying everything.
* We need to always have an m4/ directory, so that gettextize works,
so we make a dummy empty file
* Apparently gettextize is totally insane, requiring user input etc. Copy
in some hacks from Avahi's autogen.sh to work around this.
.gitignore | 1 -
ABOUT-NLS | 1281 ------------------------------------------------------------
autogen.sh | 17 +-
m4/empty | 1 +
4 files changed, 12 insertions(+), 1288 deletions(-)
commit 69dd8b722bcb1a76ff586e71c580f6844412abb9
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-12
pin: Fix uninitialized variable
p11-kit/pin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 087a815b2b9cd5e0ec44866be1ddddb948583e88
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-07
Bump version number, and tweak upload procedure
.gitignore | 1 +
Makefile.am | 3 ++-
configure.ac | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
commit e27e943b83401515b8b6acc1da705df6c56416e1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-07
Release version 0.2
NEWS | 6 ++++++
configure.ac | 2 +-
po/p11-kit.pot | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
commit 98ba6f9ffb95c5473e5e32d296956e91c4fc2715
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-06
List labels of all tokens in 'p11-kit -l'
tools/p11-kit.c | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
commit 883b3ee76c686d14bbc1f20b0805d733a0c227ad
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-07-06
More fine tuning of the pin APIs.
doc/p11-kit-sections.txt | 1 +
p11-kit/pin.c | 18 ++++++++++++++++--
p11-kit/pin.h | 4 +++-
3 files changed, 20 insertions(+), 3 deletions(-)
commit 1ff1a4895b2d5ff5fe559b96034fb1c3855d4b45
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-24
Add documentation for PIN callbacks.
doc/Makefile.am | 2 +-
doc/p11-kit-docs.sgml | 1 +
doc/p11-kit-sections.txt | 19 +++
p11-kit/pin.c | 328 +++++++++++++++++++++++++++++++++++++----------
p11-kit/pin.h | 4 +-
tests/pin-test.c | 18 +--
6 files changed, 295 insertions(+), 77 deletions(-)
commit fd7dee836d0b14efc48bf59955c8a12a72561043
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-24
Add P11KitPin structure, which encapsulates a returned pin.
* Lets us use variable size buffers.
* Helps minimize copying.
p11-kit/pin.c | 171 +++++++++++++++++++++++++++++++++++++++++++----
p11-kit/pin.h | 44 ++++++++----
tests/files/test-pinfile | 1 +
tests/pin-test.c | 161 ++++++++++++++++++++++++++++++--------------
4 files changed, 302 insertions(+), 75 deletions(-)
commit 2cc2ab90a6b96ea75dfe4d6413e41539075e8f8a
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-21
Rename p11_kit_pin_read_pinfile to p11_kit_pin_retrieve
* Fix up duplicate register logic as well.
p11-kit/pin.c | 13 +++++++------
p11-kit/pin.h | 4 ++--
tests/pin-test.c | 38 +++++++++++++++++++-------------------
3 files changed, 28 insertions(+), 27 deletions(-)
commit f1ca5d5b57909534d8b21f9be455c94ca57e6636
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-20
Implement support for registering and calling pinfile callbacks
* These are callbacks that hanlde the pinfile part of a PKCS#11 URI.
* One library can register a callback that another can then call
in a thread-safe and simple fashion.
.gitignore | 2 +
p11-kit/Makefile.am | 3 +
p11-kit/pin.c | 332 +++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/pin.h | 85 +++++++++++++
p11-kit/ptr-array.c | 150 ++++++++++++++++++++++
p11-kit/ptr-array.h | 61 +++++++++
tests/Makefile.am | 12 +-
tests/pin-test.c | 237 +++++++++++++++++++++++++++++++++++
tests/ptr-array-test.c | 259 ++++++++++++++++++++++++++++++++++++++
9 files changed, 1140 insertions(+), 1 deletion(-)
commit 0a793a9e462727f434f6283a712b37ab30df5e95
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-16
Fix logic error loading registered modules.
Thanks to Richard Bellgrim.
p11-kit/modules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b1b62f1b0856821d046ed92be076f9b9f8c664a9
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
Update pkcs11.h with PKCS#11 2.20 ammendments.
p11-kit/pkcs11.h | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
commit 6d36c108a0f00f7485967b528b2a9f7c22173a5b
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
Fixed typos and made options clearer.
doc/p11-kit-config.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit d941244aaf0cf142fee986eb914c2767f564dc14
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
By default use /etc/pkcs11 for system configs and not ${prefix}
* Packagers can override this with the --with-pkcs11-dir configure arg.
configure.ac | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
commit 4bb63ced295ddd64a019ae49cfae191524a34f07
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
Complete documentation for message functionality.
doc/p11-kit-docs.sgml | 1 +
doc/p11-kit-sections.txt | 6 ++++++
p11-kit/modules.c | 15 +++++++++++++++
p11-kit/util.c | 29 +++++++++++++++++++++++++++++
4 files changed, 51 insertions(+)
commit d6463e70eeb0ad3d93788a3e0f13e2007be54c50
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
Complete testing of global config files and directories.
tests/conf-test.c | 262 +++++++++++++++++++++++++++++++++++
tests/files/system-modules/one | 3 +
tests/files/system-modules/two | 3 +
tests/files/test-system-invalid.conf | 3 +
tests/files/test-system-merge.conf | 7 +
tests/files/test-system-none.conf | 8 ++
tests/files/test-system-only.conf | 8 ++
tests/files/test-user-invalid.conf | 3 +
tests/files/test-user-only.conf | 4 +
tests/files/test-user.conf | 3 +
tests/files/user-modules/one | 2 +
tests/files/user-modules/three | 3 +
12 files changed, 309 insertions(+)
commit 48a08272bfcc0153887b850b4ea82e8fb7d8f1ae
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-09
Store last failure message per thread.
* Add p11_kit_message() function to get last message.
doc/p11-kit-config.xml | 2 +-
p11-kit/Makefile.am | 3 +-
p11-kit/conf.c | 22 +++++++------
p11-kit/modules.c | 46 +++++++++++++++++++-------
p11-kit/p11-kit.h | 8 +++++
p11-kit/private.h | 6 ++--
p11-kit/util.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++---
tests/Makefile.am | 3 +-
tests/conf-test.c | 13 ++++----
9 files changed, 151 insertions(+), 39 deletions(-)
commit 21333019a5afceb5f07637fb50b784a4ecd9f9ff
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-08
Refactor configuration
* Move configuration loading into conf.c
* Have user modules with same name merge/override modules in system.
p11-kit/Makefile.am | 2 +-
p11-kit/conf.c | 429 +++++++++++++++++++++++++++++++++++++++++++++++-----
p11-kit/conf.h | 24 ++-
p11-kit/hash.c | 117 ++++++++------
p11-kit/hash.h | 10 +-
p11-kit/modules.c | 366 ++++++++------------------------------------
p11-kit/private.h | 11 ++
p11-kit/util.c | 17 +++
tests/conf-test.c | 40 +++--
9 files changed, 610 insertions(+), 406 deletions(-)
commit 7c1edab7e6c1c6939ecdeaefc5f006772298f9eb
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-08
Ignore files without a 'module' value.
* Just skip loading these.
p11-kit/modules.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
commit d6b8300fe9bae0595aaf894c5d98aa7c72209e38
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Bump version number.
configure.ac | 6 +++++-
po/p11-kit.pot | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
commit 5b77fb058c43e6b0b631e1c7df41994cc41cd2ac
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Make target for uploading release.
Makefile.am | 3 +++
1 file changed, 3 insertions(+)
commit bfac05a80d66668a617386e7fdf569b5eb381a93
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Release version 0.1
p11-kit/Makefile.am | 3 +++
po/p11-kit.pot | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
commit cab38f1cb262e7922098fdb03c2c5828f5f003a1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Fix up documentation
doc/p11-kit-sections.txt | 5 ++++-
p11-kit/util.c | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
commit b9a8a140cf09780671402e872130a51ec4f4b014
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Add p11_kit_space_strdup() function, and rename p11_kit_space_strlen()
* Print out module info in p11-kit tool.
p11-kit/p11-kit.h | 6 ++++++
p11-kit/uri.c | 15 ++-------------
p11-kit/uri.h | 3 ---
p11-kit/util.c | 34 ++++++++++++++++++++++++++++++++++
tools/p11-kit.c | 28 +++++++++++++++++++++++++++-
5 files changed, 69 insertions(+), 17 deletions(-)
commit b315f99c90d01104d6baa91ca0f2cfb32c920abd
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Fix more memory errors and leaks in module code.
p11-kit/modules.c | 16 ++++++++++++----
tools/p11-kit.c | 3 +++
2 files changed, 15 insertions(+), 4 deletions(-)
commit 7f5d2e9471872d8c1cf7181ba647c1dc74e2c6dd
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Free string output of conf-test
tests/conf-test.c | 1 +
1 file changed, 1 insertion(+)
commit fb8b8cada7bad73acf936c1dee2e7b1be64e3513
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Fix URI parsing memory leaks.
p11-kit/uri.c | 1 +
tests/uri-test.c | 1 +
2 files changed, 2 insertions(+)
commit 7c410200143b72a5976d228d75aab59f8b965fe9
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Fix some hash leaks and bugs.
p11-kit/hash.c | 20 ++++++++++++--------
tests/hash-test.c | 39 +++++++++++++++++++++++++++++++++++++--
2 files changed, 49 insertions(+), 10 deletions(-)
commit 0f09803ba95bcdfebf4bde509b43b3ca52cd9d3f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Fix compiler warnings.
p11-kit/hash.c | 2 +-
tests/uri-test.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
commit a5d3e34397d847a0c9b2e3aab7bd9f0b1080af05
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-07
Remove unstable API markers.
p11-kit/Makefile.am | 3 ---
p11-kit/p11-kit.h | 9 ---------
p11-kit/uri.h | 9 ---------
tests/Makefile.am | 3 +--
tools/Makefile.am | 3 +--
5 files changed, 2 insertions(+), 25 deletions(-)
commit edf0b9584f1038797758b4ed878e1d9f48beda9f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-06-06
Modernize autotools setup.
.gitignore | 1 +
configure.ac | 13 ++++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
commit 0bd6cf376133f300edff57835eb95f7577d68792
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
Clear correct block of memory in p11_kit_uri_parse().
p11-kit/uri.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 6f1e963901ca7aff7af6bec376af00f892cbb9ca
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
GNU style definitions in uri.h as well as normal.
p11-kit/uri.h | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
commit 82ca953733a651216125608d5ca7f9aa8005095e
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
Cleanup URI types
* Support with/without library version.
* Make names of types clearer.
p11-kit/uri.c | 63 ++++++++++++++++++++++++++++++------------
p11-kit/uri.h | 18 +++++++++---
tests/uri-test.c | 84 ++++++++++++++++++++++++++++----------------------------
3 files changed, 101 insertions(+), 64 deletions(-)
commit e19300129d3fe21c9e3af1a7f95ccf3eb5315199
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
Set the return value properly in p11_kit_load_initialize_module()
p11-kit/modules.c | 3 +++
1 file changed, 3 insertions(+)
commit b3b68fcb1d3fc4958acc6f6528fb88e7c87b7512
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
Add function p11_kit_uri_space_strlen() for figuring out the length
of space terminated strings.
doc/p11-kit-sections.txt | 1 +
p11-kit/uri.c | 6 +++---
p11-kit/uri.h | 3 +++
3 files changed, 7 insertions(+), 3 deletions(-)
commit 2aa964160a1615077db18b03a6c72c286c27791f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-30
Allow use with CRYPTOKI_GNU style use of PKCS#11
doc/p11-kit-sections.txt | 10 +++++++++-
p11-kit/p11-kit.h | 11 ++++++++++-
p11-kit/uri.c | 2 +-
p11-kit/uri.h | 14 +++++++++++++-
4 files changed, 33 insertions(+), 4 deletions(-)
commit cfeaf3de3d745d457feaba48c532d7a384d67341
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Add p11_kit_load_initialize_module() function.
* This function will load a module from a file path, and then
initialize it.
doc/p11-kit-sections.txt | 1 +
p11-kit/modules.c | 167 ++++++++++++++++++++++++++++++++++++++++-------
p11-kit/p11-kit.h | 3 +
3 files changed, 147 insertions(+), 24 deletions(-)
commit f03252bf032b04ed7a5b98ea52e3c75d84dc0812
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Rename module arguments from 'funcs' to 'module'
p11-kit/modules.c | 244 +++++++++++++++++++++++++++---------------------------
p11-kit/p11-kit.h | 8 +-
2 files changed, 126 insertions(+), 126 deletions(-)
commit 5d697e5ff8e3222bdb67d0ce8444b0323eeaba69
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Fix up documentation
doc/p11-kit-sections.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
commit a2fbdb1a3cd9d137010182be43fdf4ff8491dd9f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Fix problems with 'make distcheck'
Makefile.am | 4 ++++
doc/Makefile.am | 3 ++-
gtk-doc.make | 9 +++++----
tests/Makefile.am | 8 ++++++--
4 files changed, 17 insertions(+), 7 deletions(-)
commit ad14c9c4c1345fe01336fc0d5bfccd3fca248ce1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Fix uninitialized variable problem.
p11-kit/proxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit bdd6188e299405e16179906bc79f9fef2605176a
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-27
Change around installation of headers, pkg-config, and file names
* Install headers to ${prefix}/include/p11-kit-1/p11-kit/
* This solves problems with other projects that have their own
pkcs11.h files.
* Change the pkg-config file name to p11-kit-1.pc
* Change the source file names.
.gitignore | 6 +-
configure.ac | 4 +-
doc/Makefile.am | 4 +-
p11-kit/Makefile.am | 18 ++--
p11-kit/debug.h | 4 +-
p11-kit/{p11-kit-messages.c => messages.c} | 0
p11-kit/{p11-kit-lib.c => modules.c} | 2 +-
p11-kit/{p11-kit.pc.in => p11-kit-1.pc.in} | 2 +-
p11-kit/p11-kit.h | 2 +-
p11-kit/p11-kit.pc | 17 ---
p11-kit/{p11-kit-private.h => private.h} | 0
p11-kit/{p11-kit-proxy.c => proxy.c} | 2 +-
p11-kit/{p11-kit-uri.c => uri.c} | 2 +-
p11-kit/{p11-kit-uri.h => uri.h} | 2 +-
po/POTFILES.in | 2 +-
po/p11-kit.pot | 164 ++++++++++++++---------------
tests/uri-test.c | 2 +-
17 files changed, 110 insertions(+), 123 deletions(-)
commit 92f821b6883e700a97a18d244104dea1031f2dce
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-26
Add functions for clearing and setting multiple attributes on URI.
p11-kit/p11-kit-uri.c | 75 ++++++++++++++++++++++++++++++++++++---------------
p11-kit/p11-kit-uri.h | 12 ++++++---
tests/uri-test.c | 41 +++++++++++++++++++++++++---
3 files changed, 100 insertions(+), 28 deletions(-)
commit c37d5dfaf0c2a5e70066fd1c9606b00329c3622a
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-26
Return proper errors when NULL is passed to mutex functions.
p11-kit/p11-kit-lib.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
commit 0542a87afdacd2c53da5d453b1d23e8a0dd91ea4
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-26
URI API fine tuning
* Rework API for getting all the attributes, to match usage in PKCS#11
* Add support for pinfile argument in URIs.
* Complete tests.
p11-kit/p11-kit-uri.c | 365 ++++++++++++++++++++++++++++++--------------------
p11-kit/p11-kit-uri.h | 9 +-
tests/uri-test.c | 103 ++++++++++++++
3 files changed, 328 insertions(+), 149 deletions(-)
commit 7c2a8a5b3ad134b6e3093761d617936dcbd21adf
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-25
Add p11_kit_uri_message() function.
Gets messages for p11-kit error codes.
p11-kit/debug.c | 1 +
p11-kit/debug.h | 3 ++-
p11-kit/p11-kit-uri.c | 38 ++++++++++++++++++++++++++++++++++++++
p11-kit/p11-kit-uri.h | 2 ++
4 files changed, 43 insertions(+), 1 deletion(-)
commit a01f4351e34fee946d1ffb81baa31a756e2851be
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-05-24
Fix null pointer dereference.
p11-kit/p11-kit-lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit e16a0a7183bd7c400ea3df12ad6ee1155a17634c
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-04-05
Fix lots of bugs and add more debugging statements.
p11-kit/conf.c | 3 ++-
p11-kit/p11-kit-lib.c | 51 +++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 43 insertions(+), 11 deletions(-)
commit 4d7cf526a352d7c9a02d05a308eef937b1a8987d
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-04-05
Add basic tool for p11-kit.
List modules:
$ p11-kit -l
.gitignore | 2 +
Makefile.am | 1 +
configure.ac | 1 +
tools/Makefile.am | 12 ++++++
tools/p11-kit.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 137 insertions(+)
commit 6078d6d73bc2eb1dbf2283b37d9507297fefba9d
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-04-05
Add support for debug tracing.
Use P11_KIT_DEBUG=xxx environment variable to enable tracing. Must
have been built without --disable-debug option.
P11_KIT_DEBUG can (at this point) be one of these values:
all
help
conf
lib
.gitignore | 1 +
configure.ac | 23 ++++++---
doc/Makefile.am | 2 +-
p11-kit/Makefile.am | 1 +
p11-kit/conf.c | 7 +++
p11-kit/debug.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++
p11-kit/debug.h | 93 ++++++++++++++++++++++++++++++++++
p11-kit/p11-kit-lib.c | 17 ++++++-
8 files changed, 272 insertions(+), 8 deletions(-)
commit aada8e3d41c3be7cdc7e0994c7dff7c307fbbe7f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-04-01
Fix up copyright lines.
p11-kit/conf.c | 4 ++--
p11-kit/conf.h | 4 ++--
p11-kit/hash.c | 4 ++--
p11-kit/hash.h | 4 ++--
p11-kit/p11-kit-lib.c | 2 +-
p11-kit/p11-kit-private.h | 2 +-
p11-kit/p11-kit-proxy.c | 2 +-
p11-kit/p11-kit-uri.h | 2 +-
p11-kit/p11-kit.h | 2 +-
p11-kit/util.c | 1 -
p11-kit/util.h | 1 -
11 files changed, 13 insertions(+), 15 deletions(-)
commit 579d40eff31c7a17cc4e4f07d26c6189619fee31
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Add C++ header guards, and require API instability acknowledgement.
p11-kit/Makefile.am | 3 +++
p11-kit/p11-kit-uri.h | 23 ++++++++++++++++++++---
p11-kit/p11-kit.h | 17 +++++++++++++++++
tests/Makefile.am | 3 ++-
4 files changed, 42 insertions(+), 4 deletions(-)
commit cf988aa7858d249887ea0818301c7211bb3cab38
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Support setting of CK_C_INITIALIZE_ARGS.pReserved to string.
This is a naughty little thing that a lot of PKCS#11 modules require
to be properly initialized. So we support setting pReserved to a string
that is in the config under the 'x-init-reserved' parameter.
p11-kit/p11-kit-lib.c | 7 +++++++
1 file changed, 7 insertions(+)
commit 540a00501ba682b420b143480d5864335cad6c71
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Give reference chapter an explicit id.
doc/p11-kit-docs.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 52dab5cd52b19352e9f29b16c686fc545d2aadf1
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Add make target for uploading docs.
Makefile.am | 6 ++++++
1 file changed, 6 insertions(+)
commit a0ef9771b882bf2dc5bd56fcc6bcfdf47ed90feb
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Mix in other documentation.
doc/Makefile.am | 2 +-
doc/p11-kit-config.xml | 10 ++++++----
doc/p11-kit-docs.sgml | 12 ++++++++----
...p11-kit-multiple-problem.xml => p11-kit-sharing.xml} | 0
doc/style.css | 17 ++++++++++-------
5 files changed, 25 insertions(+), 16 deletions(-)
commit ca1d8a09e05444de07a1ad722b57f5dcae042892
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Fix up styling and tweaks.
doc/style.css | 24 +++++++++++++++++-------
p11-kit/p11-kit-messages.c | 4 ++--
2 files changed, 19 insertions(+), 9 deletions(-)
commit 17ebc007ed0376bdea50294201a637be982d68b7
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Fix up styling of documentation.
doc/p11-kit-docs.sgml | 2 +-
doc/style.css | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
gtk-doc.make | 4 ++-
3 files changed, 74 insertions(+), 2 deletions(-)
commit 479cbd55ee5739d3cd2566379575451dbecf4c54
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Documentation and API cleanup.
* Rename source directory
* More consistent with return values from URI functions.
* Allow formatting URI to take a uri type.
.gitignore | 17 ++
Makefile.am | 6 +-
configure.ac | 17 +-
doc/Makefile.am | 80 ++++++--
doc/p11-kit-docs.sgml | 24 +++
doc/p11-kit-overrides.txt | 0
doc/p11-kit-sections.txt | 40 ++++
doc/version.xml.in | 1 +
gtk-doc.make | 230 +++++++++++++++++++++
{module => p11-kit}/Makefile.am | 1 -
{module => p11-kit}/conf.c | 0
{module => p11-kit}/conf.h | 0
{module => p11-kit}/hash.c | 1 -
{module => p11-kit}/hash.h | 0
{module => p11-kit}/p11-kit-lib.c | 103 +++++++---
{module => p11-kit}/p11-kit-messages.c | 16 +-
{module => p11-kit}/p11-kit-private.h | 0
{module => p11-kit}/p11-kit-proxy.c | 0
{module => p11-kit}/p11-kit-uri.c | 360 +++++++++++++++++++++++++++------
{module => p11-kit}/p11-kit-uri.h | 25 +--
{module => p11-kit}/p11-kit.h | 0
p11-kit/p11-kit.pc | 17 ++
{module => p11-kit}/p11-kit.pc.in | 0
{module => p11-kit}/pkcs11.h | 0
{module => p11-kit}/util.c | 0
{module => p11-kit}/util.h | 0
tests/Makefile.am | 8 +-
tests/uri-test.c | 82 ++++----
28 files changed, 857 insertions(+), 171 deletions(-)
commit 6132cd99c39739ef5360e41e92f22d287007577e
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
WIP
module/p11-kit-lib.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++
module/p11-kit-uri.c | 43 +++++++++++++++++++
2 files changed, 162 insertions(+)
commit c45d9df39035dee8a3fff610d98ac3b4c245f1dc
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Fix for previous commit.
Actually use the alloc_module_unlocked() function.
module/p11-kit-lib.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 9985957799fd7142125f1d2dd0fae4366ec83f32
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-31
Custom initialization and finalization arguments cannot be supported.
When multiple consumers are using a PKCS#11 module, initialization
(and finalization) arguments cannot be supported. The first one calling
would win out, and the others would get unexpected behavior.
module/p11-kit-lib.c | 193 ++++++++++++++++++++++++-----------------------
module/p11-kit-private.h | 4 +-
module/p11-kit-proxy.c | 4 +-
module/p11-kit.h | 6 +-
4 files changed, 104 insertions(+), 103 deletions(-)
commit 1104f03d9b34cc659838124e00ac864c35af4f82
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-03
Add info and copyright.
doc/p11-kit.xml | 42 ++++++++++++++++++++++++++++++++++--------
1 file changed, 34 insertions(+), 8 deletions(-)
commit d05a04968e07f6a2084ceb747938dc7cc049cb5f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-03-03
The start of some documentation.
.gitignore | 2 +
Makefile.am | 2 +-
configure.ac | 1 +
doc/Makefile.am | 22 ++++++++
doc/docbook-params.xsl | 39 +++++++++++++
doc/p11-kit-config.xml | 119 +++++++++++++++++++++++++++++++++++++++
doc/p11-kit-multiple-problem.xml | 92 ++++++++++++++++++++++++++++++
doc/p11-kit.xml | 11 ++++
8 files changed, 287 insertions(+), 1 deletion(-)
commit 25cbc9b3293f2c6df38bd0528b89101e5e547321
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-21
Add uri function for listing which attribute types are present.
module/p11-kit-uri.c | 24 +++++++++++++++++++++++-
module/p11-kit-uri.h | 3 +++
2 files changed, 26 insertions(+), 1 deletion(-)
commit ff7db14f0acae463165377f2d4b999e566298b40
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-21
Fix bug where we try to dlclose() modules we didn't load.
module/p11-kit-lib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 1d9ca2ddb4df85b7235ec78e4996cf2d1fd775a2
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-19
Reference implementation of PKCS#11 URIs
.gitignore | 1 +
module/Makefile.am | 3 +
module/p11-kit-proxy.c | 14 +-
module/p11-kit-uri.c | 886 ++++++++++++++++++++++++++++++++++++++++
module/p11-kit-uri.h | 101 +++++
module/p11-kit.h | 2 +
module/util.c | 51 +++
module/util.h | 45 +++
tests/Makefile.am | 7 +-
tests/uri-test.c | 1050 ++++++++++++++++++++++++++++++++++++++++++++++++
10 files changed, 2146 insertions(+), 14 deletions(-)
commit 65509aa3a7c35d8bd5a947ca87c14d4de11deb21
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-18
Add p11_kit_strerror() method and internationalization.
.gitignore | 5 +
ABOUT-NLS | 1281 +++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 4 +-
configure.ac | 4 +
module/Makefile.am | 14 +-
module/p11-kit-lib.c | 4 +-
module/p11-kit-messages.c | 234 +++++++++
module/p11-kit.h | 2 +
po/Makefile.in.in | 444 ++++++++++++++++
po/Makevars | 41 ++
po/POTFILES.in | 2 +
po/Rules-quot | 47 ++
po/boldquot.sed | 10 +
po/en@boldquot.header | 25 +
po/en@quot.header | 22 +
po/insert-header.sin | 23 +
po/p11-kit.pot | 342 ++++++++++++
po/quot.sed | 6 +
po/remove-potcdate.sin | 19 +
19 files changed, 2523 insertions(+), 6 deletions(-)
commit 5cc83571c3e0e212f4d84b05bb15088409d9c752
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-17
Properly read user-config setting.
* Unless the system 'user-config' setting is 'none' we allow
the user to override or merge all settings, including the
'user-config' setting.
module/p11-kit-lib.c | 187 ++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 146 insertions(+), 41 deletions(-)
commit 80fe1806941d555433f3a1c97ab116dd281041e0
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-17
Add a proper pkg-config file.
.gitignore | 2 ++
configure.ac | 25 ++++++++++++++-----------
module/Makefile.am | 10 +++++-----
module/p11-kit.pc.in | 17 +++++++++++++++++
4 files changed, 38 insertions(+), 16 deletions(-)
commit c03b1023835887569315fbec6295be3cc0f4cf42
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-02-17
Only allow colon between name and value.
module/conf.c | 4 ++--
tests/files/test-1.conf | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
commit 14dfb79ca65dd80e117103c4f8852ae2b4a419a0
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-30
Configuration tests.
.gitignore | 1 +
module/conf.c | 25 ++++++----
module/conf.h | 6 +--
module/p11-kit-lib.c | 8 ++--
tests/Makefile.am | 13 ++++--
tests/conf-test.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/files/test-1.conf | 6 +++
7 files changed, 158 insertions(+), 22 deletions(-)
commit 4375e297b19bc2177e17cc5616e75d96be053328
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-26
Add testing and start testing hash table functionality.
.gitignore | 8 +
Makefile.am | 12 +-
configure.ac | 42 ++++++
module/Makefile.am | 16 +-
module/hash.c | 15 ++
module/hash.h | 5 +
tests/Makefile.am | 17 +++
tests/cutest/CuTest.c | 339 ++++++++++++++++++++++++++++++++++++++++++
tests/cutest/CuTest.h | 116 +++++++++++++++
tests/cutest/README.txt | 211 ++++++++++++++++++++++++++
tests/cutest/license.txt | 38 +++++
tests/hash-test.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++
12 files changed, 1191 insertions(+), 5 deletions(-)
commit f8009b4d504de0ed752b867893acd263108409e0
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-24
Reinitialize modules after fork().
module/p11-kit-lib.c | 51 ++++++++++++++++++++++++++++++++++++++++++++----
module/p11-kit-private.h | 1 +
module/p11-kit-proxy.c | 18 +++++++++++++++++
3 files changed, 66 insertions(+), 4 deletions(-)
commit b2b0acbc5789823a33de9eabec10e2b8656f3632
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-24
Initial implementation with new config system.
configure.ac | 3 +-
module/Makefile.am | 10 +-
module/conf.c | 240 ++++++++++
module/conf.h | 51 +++
module/hash.c | 512 +++++++++++----------
module/hash.h | 110 +++--
module/p11-kit-lib.c | 810 ++++++++++++++++++++++++++++++++++
module/p11-kit-private.h | 51 +++
module/{p11-kit.c => p11-kit-proxy.c} | 696 ++---------------------------
module/p11-kit.h | 12 +-
10 files changed, 1558 insertions(+), 937 deletions(-)
commit 5a53e44a73d4fb62483e890fe348ea40d27ef573
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-24
Rename to p11-kit.
A less pretentios, better description of what's going on.
ChangeLog | 2 +-
configure.ac | 4 +-
module/Makefile.am | 8 +-
module/{p11-unity.c => p11-kit.c} | 312 +++++++++++++++++++-------------------
module/{p11-unity.h => p11-kit.h} | 28 ++--
5 files changed, 177 insertions(+), 177 deletions(-)
commit 492c2ff7c191e5df75140a47e4e43fa25fd16023
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-22
Rework public library API so that we can initialize arbitrary
modules.
module/p11-unity.c | 752 ++++++++++++++++++++++++++++++++++-------------------
module/p11-unity.h | 21 +-
2 files changed, 502 insertions(+), 271 deletions(-)
commit c2a5aaf7baf4bcc006674a1938205f93028b8ab0
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-22
Rough idea of possible library functions.
configure.ac | 5 +-
module/p11-unity.c | 307 ++++++++++++++++++++++++++++++++++++++++++++---------
module/p11-unity.h | 56 ++++++++++
3 files changed, 314 insertions(+), 54 deletions(-)
commit a50ba779ff3e0a5d4f35fb2b6ab525a423575cc4
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-01-20
Initial implementation of p11-unity
.gitignore | 31 ++
AUTHORS | 1 +
COPYING | 47 ++
ChangeLog | 31 ++
Makefile.am | 18 +
NEWS | 2 +
README | 1 +
autogen.sh | 21 +
configure.ac | 90 +++
module/Makefile.am | 18 +
module/hash.c | 400 ++++++++++++++
module/hash.h | 158 ++++++
module/p11-unity.c | 1543 ++++++++++++++++++++++++++++++++++++++++++++++++++++
module/pkcs11.h | 1357 +++++++++++++++++++++++++++++++++++++++++++++
14 files changed, 3718 insertions(+)
|