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
|
2013-06-26 Niels Mller <nisse@lysator.liu.se>
* Released lsh-2.1.
2013-06-18 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/mini-inetd.c (main): Clear O_NONBLOCK flag on
accepted sockets.
* src/testsuite/tcpconnect.c: Include netinet/in.h.
(main): Set seen_remote_eof and seen_stdin_eof flags at EOF.
2013-06-16 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Updated URLs for gmp and liboop.
* src/testsuite/tcpconnect.c (main): Make use of FIONREAD
conditional on it being defined.
2013-06-15 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Use AC_CONFIG_HEADER, not AM_CONFIG_HEADER.
Replace use of obsolete AM_PROG_CC_STDC and am_cv_prog_cc_stdc.
2013-06-04 Niels Mller <nisse@lysator.liu.se>
* .bootstrap: Deleted obsolete references to the deleted
src/nettle subdirectory. Spotted by David Michael.
2013-04-22 Niels Mller <nisse@lysator.liu.se>
From master branch (2011-05-02):
* src/testsuite/serpent-test.c: Updated for correct serpent byte
order.
2013-04-19 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version number to 2.1.
* All files: Include nettle headers using <nettle/...> rather than
"nettle/...", and include them before lsh headers.
2013-04-19 Magnus Holmgren <holmgren@debian.org>
* src/lsh.c (do_lsh_default_handler): Call exit for
EXC_IO_CONNECT, to terminate properly on connection failure.
* src/io.c (io_bind_sockaddr): Set the IPV6_V6ONLY socket option
on AF_INET6 sockets.
* src/unix_random.c (random_init): Show the intended error message
when no seed file exists, instead of one about a locking error.
2013-04-03 Niels Mller <nisse@lysator.liu.se>
From master branch:
* src/dsa.c (do_dsa_verify): Require dsa signature blob to be
exactly 40 octets.
(dsa_blob_length): Deleted function.
(dsa_blob_write): Blob always 40 octets.
(do_dsa_sign): Deleted call to dsa_blob_length. Check return value
from dsa_sha1_sign.
(parse_ssh_dss_public): Require q to be exactly 160 bits.
2013-03-30 Niels Mller <nisse@lysator.liu.se>
From Magnus Holmgren's debian patches. Adapt to nettle-2.1.
* src/crypto.c (make_des3_cbc_instance): Adapted to new des interface.
* src/dsa.c (do_dsa_verify): Adapted to new DSA interface.
(parse_ssh_dss_public): Likewise.
(do_dsa_sign): Likewise.
(make_dsa_verifier): Likewise.
(make_dsa_signer): Likewise.
* src/lsh-keygen.c (dsa_generate_key): Likewise.
From Magnus Holmgren's debian patches. Adapt to nettle-2.0.
* src/lsh-make-seed.c (main): Updated to new yarrow interface,
sith no seed_file data inside the context.
* src/unix_random.c (write_seed_file): Likewise.
(update_seed_file): Update yarrow state before writing the new
seed file.
* src/crypto.c: Updated casts for new nettle_crypt_func no longer
being a pointer.
* src/Makefile.am (LDADD): Added -lhogweed.
* src/testsuite/Makefile.am (LDADD): Likewise.
* src/nettle: Deleted subdirectory.
From Magnus Holmgren's debian patches.
* configure.ac, */Makefile.am: Don't use the bundled nettle
library. Also updated test cases using the sexp-conv program.
2013-03-29 Niels Mller <nisse@lysator.liu.se>
From Ludovic Courts:
* src/lshd.c (main_argp_parser): Correctly handle the
`--no-root-login' option.
* src/lsh-pam-checkpw.c (SERVICE_NAME): Use the more descriptive
name "lshd".
2013-03-13 Niels Mller <nisse@lysator.liu.se>
Mostly copied from master branch:
* src/testsuite/functions.sh: Don't use set -e.
(need_tcputils): Deleted function.
(at_connect): Use ./mini-inetd.
* src/testsuite/lshd-random-input-test: Use ./tcpconnect and
./mini-inetd, rather than the possibly installed version from
tcputils. Don't use need_tcputils.
* src/testsuite/lshg-tcpip-local-test: Likewise.
* src/testsuite/rapid7-lsh-test: Likewise.
* src/testsuite/rapid7-lshd-test: Likewise.
* src/testsuite/socks4-test: Likewise.
* src/testsuite/socks5-test: Likewise.
* src/testsuite/tcpip-local-in-use-test: Likewise.
* src/testsuite/tcpip-local-test: Likewise.
* src/testsuite/tcpip-remote-test: Likewise.
2013-03-10 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am: Rules to build tcpconnect and
mini-inetd.
* src/testsuite/tcpconnect.c: New program, copied from master
branch.
* src/testsuite/mini-inetd.c: Likewise.
2013-03-09 Niels Mller <nisse@lysator.liu.se>
* src/unix_process.c (utmp_book_keeping): Don't pass utmp's ut_tv
directly to gettimeofday, since for binary compatibility, utmp may
use a different type.
* src/scm/guile-compat.scm: Use the rdelim module, for the
read-line function.
2007-09-05 Niels Mller <nisse@lysator.liu.se>
* Released lsh-2.0.4.
2007-09-05 Niels Mller <nisse@lysator.liu.se>
* src/client_x11.c (do_client_channel_x11_receive): Fixed parser
bookkeeping. Was broken before the 1.5.4 release. Problem reported
by Kaloian Doganov.
2006-05-09 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version number to 2.0.4.
* Released lsh-2.0.3.
2006-05-08 Niels Mller <nisse@lysator.liu.se>
* doc/ssh-conv.1: Changed to ordinary line breaks in example
ssh-conv output.
* src/connection.c (do_connection_flow_controlled)
(connection_send_kex): Trace output for hard_limit changes.
* Man pages: Applied patch from Stefan Pfetzing, addressing long
lines and non-ascii caharacters.
2006-05-04 Niels Mller <niels@s3.kth.se>
* src/testsuite/daemon-fd-test: Reverted previous change. Use a
single-digit fd.
2006-05-03 Niels Mller <niels@s3.kth.se>
* src/testsuite/daemon-fd-test: Avoid using exec with no arg, for
better portability.
* src/daemon.c (daemon_started_by_inetd): Deleted debug message.
2006-05-01 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/lshg-cat-test: Fixed message for compare_output.
* src/daemon.c (daemon_init): When backgrounding, let the parent
process use _exit rather than exit. We used to let the
intermediate process wait on the child, in order to print out a
message for any unexpected status code. But then we get a race in
the testsuite, because that process may keep the listen sockets
open even after the main process has deleted its pid file.
* src/lshd.c (main): Fixed handling of stderr, with --no-syslog.
2006-04-29 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Check for function getdtablesize.
* src/testsuite/Makefile.am (TS_SH): Added daemon-fd-test.
* src/testsuite/daemon-1-test: Renamed file to...
* src/testsuite/daemon-fd-test: ... new file. Improved test, using
/proc/self/fd.
* src/lshd.c (main): Improved daemonic behaviour. Call
daemon_close_fds. When --daemonic --no-syslog is given, still perform all
daemonic processing except for the redirect of stderr to /dev/null.
* src/daemon.h: Updated prototypes. Deleted C++ guard.
* src/daemon.c (daemon_pidfile): Deleted #if:ed out file locking
code.
(daemon_started_by_init, daemon_started_by_inetd): Made static.
(daemon_detect): New function, split out from daemon_init.
(daemon_dup_null): Likewise.
(getdtablesize): New function, for systems that don't have it in
libc.
(daemon_close_fds): New function.
(daemon_init): New argument with the daemon mode. Split handling
of fd:s to the new functions daemon_dup_null and daemon_close_fds.
2006-04-28 Niels Mller <niels@s3.kth.se>
* src/testsuite/daemon-1-test: New test. Test that lshd doesn't
leak any fd:s to child processes.
2006-02-09 Niels Mller <nisse@lysator.liu.se>
* doc/index.html: Updated sshtools link, after prodding from
Jerrad Pierce.
2006-01-27 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version to 2.0.3.
* Released lsh-2.0.2.
* NEWS: Entry for 2.0.2.
2006-01-23 Niels Mller <niels@s3.kth.se>
* src/xauth.c (x11_forward): Commented out unused class.
* src/lsh-make-seed.c (spawn_source_process): Explicitly close
dev_null fd in child process.
* src/unix_random.c (do_device_source, random_init): Use
io_set_close_on_exec, to avoid fd:s leaking to user shells.
* src/werror.c (werror_argp_parser): Likewise.
* src/server_pty.c (pty_open_master): Likewise.
* src/unix_interact.c (make_unix_interact): Likewise (even if this
is in the client).
* src/io.c (lsh_pushd_fd): Likewise.
(lsh_pushd): Likewise. Also fixed EINTR logic.
2005-11-28 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/lcp-test: Skip test if /bin/bash doesn't exist.
2005-11-26 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/lsh-6-test (ALGORITHMS): Try both aes-cbc and
aes-ctr.
* src/dummy.c (ctr_crypt): New dummy implementation.
* src/lsh_string.c (lsh_string_ctr_crypt): New function.
* src/crypto.c (class aes_cbc_instance): Renamed class, was
aes_instance. Renamed the corresponding functions too.
(aes_ctr_instance): New class.
(do_aes_ctr_crypt, make_aes_ctr_instance): New functions.
(crypto_aes256_ctr_algorithm): New algorithm.
* src/algorithms.c (all_symmetric_algorithms): Added
ATOM_AES256_CTR.
(all_crypto_algorithms): Likewise.
(lookup_crypto): Check for "aes256-ctr" and "aes-ctr".
* src/atoms.in: Added symbols for counter mode ciphers.
2005-11-25 Niels Mller <nisse@lysator.liu.se>
* misc/run-tests (find_program): If argument contains a slash
(most likely because VPATH expansion in make), return the filename
as is.
* .bootstrap: Don't exit if src/nettle/aclocal.m4 already exists.
Make all symlinks before checking for the "links" argument.
* configure.ac (LSH_GCC_FUNCTION_NAME): Deleted use of this macro.
Deleted the checks for the sizes of short, int and long. Use
-Wno-pointer-sign when compiling with gcc-4.x.
2005-11-25 Niels Mller <niels@s3.kth.se>
* misc/run-tests: New -v option, propagated to test programs.
* src/ssh-conv: Fixed syntax error in awk program.
2005-11-23 Niels Mller <niels@s3.kth.se>
* src/xalloc.h (number_of_strings): Deleted declaration.
2005-11-20 Niels Mller <nisse@lysator.liu.se>
* src/ssh-conv: In the awk script, check for ssh-dsa and ssh-rsa
only when state == 0.
* misc/run-tests: Added --debug option. If used, the teardown-env
script is not run.
2005-11-07 Niels Mller <nisse@lysator.liu.se>
* .bootstrap: Link config.sub and config.guess to the nettle and
spki subdirectories.
* acinclude.m4 (LSH_CCPIC): AC_REQUIRE AC_CANONICAL_HOST, and use
$host_os instead of uname.
(LSH_RPATH_INIT): Likewise.
* config.guess, config.sub: Moved files from src/nettle.
2005-10-16 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_GCC_ATTRIBUTES): Put the declaration and
definition of the test function in the declarations argument of
AC_TRY_COMPILE. It used to end up inside main.
2005-10-15 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (GMP_TRY_ASSEMBLE): New macro.
2005-10-05 Niels Mller <nisse@lysator.liu.se>
* doc/lsh.texinfo: Use @documentencoding ISO-8859-1.
2005-09-23 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_FUNC_ALLOCA): Moved inclucion of malloc.h and
check of HAVE_MALLOC_H inside #ifndef __GNUC__. On FreeBSD 4.9,
malloc.h exists but generates obsoleteness warnings when used.
2005-09-07 Niels Mller <niels@s3.kth.se>
* doc/lsh.texinfo (sexp): Updated documentation on sexp-conv
--hash.
2005-09-06 Niels Mller <niels@s3.kth.se>
* src/parse_config.c (parse_groups): Made group name optional.
* src/lsh-decode-key.c (lsh_decode_key): Removed redundant
"lsh-decode-key:" prefix from messages.
2005-07-02 Niels Mller <nisse@lysator.liu.se>
* src/client.c (init_client_options): Use gc_global for the
resource list. Needed for consistent gc if the connection fails.
2005-03-16 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version to 2.0.2.
* Released 2.0.1.
* NEWS: Entry for 2.0.1.
* src/atoms.in: Deleted diffie-hellman-group2-sha1.
* src/lsh.c (main_argp_parser): Deleted support for
diffie-hellman-group2-sha1.
* src/lshd.c (main_argp_parser): Likewise.
2005-03-14 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/lsh-7-test: Set $HOME when invoking lsh, to
prevent it from picking up files in the real $HOME/.lsh directory.
* src/testsuite/rapid7-lsh-test: Likewise.
* src/unix_interact.c (read_password): Ask for passwords also in
quiet mode. Reported by Georg Sauthoff.
* src/charset.c (ucs4_is_control): Don't treat '\n' as a dangerous
control character. Reported by Georg Sauthoff.
2005-02-12 Niels Mller <nisse@lysator.liu.se>
* src/keyexchange.c (parse_kexinit): Bugfix (DOS).
2005-02-01 Niels Mller <nisse@lysator.liu.se>
* src/exception.h (HANDLER_CONTEXT): Don't use FUNCTION_NAME.
* src/lsh_string.h (lsh_string_alloc): Likewise.
* acinclude.m4 (LSH_GCC_FUNCTION_NAME): The __FUNCTION__ feature
of gcc has been obsoleted, so don't bother testing for it. (This
makes trace messages less useful).
2004-12-22 Niels Mller <niels@s3.kth.se>
* src/lsh-make-seed.c (get_system): Fixed handling of error from
read, bug #1477.
2004-12-08 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version to 2.0.1.
2004-12-07 Niels Mller <nisse@lysator.liu.se>
* Released lsh-2.0.
* src/environ.h.in (USER_NAME_FROM_ENV): Examine $LOGNAME before
$USER. This is the same behaviour as emacs and rcs.
2004-12-07 Pontus Freyhult <pont@soua.net>
* doc/lsh.texinfo (Action options): Added --detach and
--write-pid options.
(Features): Added section about gateway mode.
(Invoking lshg): New node.
(Action options): Added --subsystem option.
(Invoking lshd): Added --subsystems option.
2004-12-06 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version to 2.0.
2004-12-05 Niels Mller <nisse@lysator.liu.se>
* src/lshg.c (do_exc_lshg_handler): Exit only for EXC_IO_CONNECT
errors.
2004-12-05 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/tcpip-remote-test: Don't run tcpconnect with
/dev/null as standard input; for some reason, that doesn't work on
SunOS-5.4.
2004-11-30 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/functions.sh (test_done): New function, used when
exiting the testscripts. This is instead of using trap, which
seemed to be unreliable on SunOS-5.4.
(spawn_lshd): On failure, return exit code 1 from the function,
instead of invoking test_fail.
* src/testsuite/lsh-6-test: Fixed handling of return value from
spawn_lshd.
* src/testsuite/lcp-test: Use die instead of test_fail.
* src/testsuite/lsh-decrypt-key-test: Likewise.
* src/testsuite/inetd-test: Use test_done.
* src/testsuite/keygen-1-test: Likewise.
* src/testsuite/keygen-2-test: Likewise.
* src/testsuite/lsh-1-test: Likewise.
* src/testsuite/lsh-2-test: Likewise.
* src/testsuite/lsh-3-test: Likewise.
* src/testsuite/lsh-5-test: Likewise.
* src/testsuite/lsh-7-test: Likewise.
* src/testsuite/lsh-8-test: Likewise.
* src/testsuite/lsh-9-test: Likewise.
* src/testsuite/lsh-encrypted-key-test: Likewise.
* src/testsuite/lshd-no-auth-test: Likewise.
* src/testsuite/lshg-1-test: Likewise.
* src/testsuite/lshg-tcpip-local-test: Likewise.
* src/testsuite/seed-test: Likewise.
* src/testsuite/socks4-test: Likewise.
* src/testsuite/socks5-test: Likewise.
* src/testsuite/tcpip-local-in-use-test: Likewise.
* src/testsuite/tcpip-local-test: Likewise.
* src/testsuite/tcpip-remote-test: Likewise.
* src/testsuite/write-key-1-test: Likewise.
* src/testsuite/write-key-2-test: Likewise.
* src/testsuite/x11-1-test: Likewise.
2004-11-26 Niels Mller <nisse@lysator.liu.se>
* src/io.c (io_bind_local): NUL-terminate AF_UNIX socket name.
2004-11-25 Niels Mller <nisse@lysator.liu.se>
* misc/xenofarm.sh: Don't insist on using GNU make. If we're not
using GNU make, disable dependency tracking, since it wont' work
with nettle.
2004-11-23 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): New configure flag
--disable-dependency-tracking. New substitution DEP_INCLUDE.
* src/lshg.c (make_lshg_connect): New argument, resource.
(main): Pass options->super.resources to make_lshg_connect.
* src/gateway_commands.c (gateway_make_connection): New argument,
a resource to be adopted by the connection.
(gateway_init): Likewise.
(gateway_accept): Pass a NULL-resource to gateway_make_connection.
2004-11-22 Niels Mller <nisse@lysator.liu.se>
* src/client.c (init_client_options): Init the resources list.
(make_client_session): Use IO_STDERR. Add the session resources to
options->resources, instead of calling gc_global.
* src/client.h (client_options): New attribute, resources.
* src/srp-gen.c (main_argp_parser): Updated for changes to
io_write_file.
* src/lshd.c: Updated for changes to handshake_command. Pass a
NULL resource.
(make_lshd_listen_callback): Updated for changes to
make_handshake_info.
* src/lsh.c (do_lsh_lookup): Use a single A_WRITE to write the
acl-entry to a file.
(make_lsh_connect): New argument resource. Deleted kexinit
argument (it's now part of handshake_info). Use the new protect
command, to pass the resource to handshake, and destroy it on
exceptions.
(main_argp_parser): Updated for changes io_write_file.
(main): Updated for changes to make_lsh_connect and
make_handshake_info. Pass options->super.resources to the
handshake command.
* src/io.c (WITH_LIBOOP_SIGNAL_ADAPTER): Compile time choice of
whether or not to use the liboop signal adapter.
(io_init) [WITH_LIBOOP_SIGNAL_ADAPTER]: Create signal adapter.
(io_final) [WITH_LIBOOP_SIGNAL_ADAPTER]: Destroy signal adapter.
(make_lsh_fd): Files of both types IO_STDIO and IO_STDERR are
shared. Bugfix: Don't reset type to zero.
(write_only_file): New class.
(do_write_only_file, make_io_write_file): New function.
(io_write_file): Don't create a lsh_fd. Instead, use the simpler
write_only_file, and return a struct abstract_write *. These files
are never closed.
(close_fd): Don't close files of type IO_STDERR. For files of type
IO_STDIO, close them, and map the fd to /dev/null.
* src/io.h (io_type): New enum constant IO_STDERR.
* src/handshake.c (make_handshake_info): New argument kexinit.
(handshake_command): New first argument, a resource to be adopted
by the connection. Deleted the kexinit argument, kexinit is now
passed as an attribute of handshake_info.
* src/handshake.h (handshake_info): New attribute kexinit.
* src/gc.c (gc_iterate_objects): New function (#if:ed out), for
debugging purposes.
* src/command.c (catch_collect_body): Deleted unused class.
(do_catch_collect_body, make_catch_collect_body, do_catch_simple):
Deleted functions.
(protect_handler): New class.
(protect_command)): New command.
* src/command.h (catch_command): Deleted unused class.
2004-11-20 Pontus Freyhult <pont@soua.net>
* doc/Makefile.am (man_MANS): Added new manpages so they'll
be installed.
(EXTRA_DIST): Added man_MANS.
* doc/lsh.texinfo (Files and environment variables): Added
documentation for LSHFLAGS, LSHGFLAGS, SSH_CLIENT and SSH_TTY.
(Converting keys): Added lsh-export-key example. Rewrote part
about lshs SPKI format slightly.
* doc/lshg.1: LSHGFLAGS, not LSHG_FLAGS.
* doc/lshg.1: LSHFLAGS, not LSH_FLAGS.
* doc/ssh-conv.1, doc/lsh-upgrade.1, doc/lsh-make-seed.1,
doc/lsh-keygen.1, doc/lsh-keygen.1, doc/lsh-export-key.1,
doc/lsh-decrypt-key.1, doc/lsh-decode-key.1, doc/lsh-writekey.1,
doc/lsh-authorize.1, doc/lsh-upgrade-key.1, doc/lsh.1,
doc/lshd.8, doc/lshg.1: Added disclaimer pointing to info system.
* doc/ssh-conv.1 (lsh-decode-key): New manpage.
* doc/lsh-upgrade.1: Misc. fixes.
* doc/lsh-make-seed.1: New manpage.
* doc/lsh-keygen.1: New manpage.
* doc/lsh-export-key.1: New manpage.
* doc/lsh-decrypt-key.1: New manpage.
* doc/lsh-decode-key.1: New manpage.
* doc/lsh-writekey.1: New manpage.
2004-11-19 Niels Mller <nisse@lysator.liu.se>
* src/io.c (io_final): Assert that nfiles == 0.
(do_buffered_read): Added trace output on EOF.
(do_consuming_read): Likewise.
(close_fd_write): Added trace output. Close the file if there's no
write buffer and no read callback.
* src/io.h (class lsh_fd): Deleted unused attribute next.
2004-11-19 Pontus Freyhult <pont@soua.net>
* doc/lsh-authorize.1, doc/lsh-upgrade-key.1, doc/lsh-upgrade.1,
doc/lsh.1, doc/lshd.8, doc/lshg.1: Added missing dot in AUTHOR
sentence.
* doc/lsh.texinfo (Converting keys): Added example for sshd host.
(Features): Added bit about SOCKS proxy feature.
* src/lshg.c (main_options): Added missing dot in -G option help.
* doc/lsh.1: Updated for lsh 2.0.
* doc/lshd.8: Updated for lsh 2.0.
* doc/lshg.1: New man page.
* doc/lsh-authorize.1: New man page.
* doc/lsh-upgrade.1: New man page.
* doc/lsh-upgrade-key.1: New man page.
2004-11-18 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): Use [!...] instead of
[^...] for inverted character classes in case.
* src/Makefile.am (bin_SCRIPTS): Install the lcp script.
* src/lsh-export-key.c (enum output_mode): New enum.
(encode_base64_line): New function.
(sexp_to_ssh2_key): Alternative output formats, fingerprint and
openssh single-line format.
(main_options): New options --fingerprint and --openssh.
(make_options): Make standard format the default output format.
(main_argp_parser): Handle new options.
* src/spki.c (spki_make_verifier): New third argument for
returning the name of the algorithm. Updated callers.
* misc/xenofarm.sh (oopcfgargs): Disable all add-on liboop
adapters.
2004-11-18 Niels Mller <niels@s3.kth.se>
* README: Updated examples, and the lists of needed tools and
libraries.
* misc/xenofarm.sh (oopcfgargs): Build liboop with
--disable-shared.
2004-11-17 Niels Mller <nisse@lysator.liu.se>
* src/unix_random.c (do_trivia_source): Check HAVE_GETRUSAGE.
* src/lsh-writekey.c (main_argp_parser): Fixed C99-ism.
2004-11-16 Niels Mller <nisse@lysator.liu.se>
* misc/getopt.h: Deleted __ from argument names in prototypes,
i.e. "argc", not "__argc". Needed for mingw compilation.
* .bootstrap: Typo fix.
* misc/getopt.c, misc/getopt1.c, misc/getopt.h: Moved files here.
Linked into the directories that need them by ./.bootstrap.
* src/environ.h.in (USER_NAME_FROM_ENV): Check $USER first.
2004-11-14 Niels Mller <nisse@lysator.liu.se>
* src/io.c (handle_nonblock_error): Ignore errno ENOTTY. FreeBSD 5
returns this error code when we try to set /dev/null in
non-blocking mode.
* src/environ.h.in (USER_NAME_FROM_ENV): New macro, which consults
both $LOGNAME and $USER.
* src/client.c (init_client_options): Use it.
* src/srp-gen.c (make_srp_gen_options): Likewise.
* src/lshd.c (main_argp_parser): Likewise.
* src/lsh-writekey.c (main_argp_parser): Likewise.
* src/server_pty.c: When using snprintf, NUL-terminate the strings
explicitly.
* .bootstrap: Link misc/vsnprintf.c info the argp and sftp
directories.
* misc/vsnprintf.c: Portable and public domain implementation of
snprintf and vsnprintf, copied from
http://www.fiction.net/blong/programs/snprintf.c, with some minor
fixes. This file is moved here from the src/argp directory.
* src/testsuite/Makefile.am (CLEANFILES): Delete testfiles lcp-file-*.txt
(TS_SH): Added lcp-test.
* src/testsuite/lcp-test: Test cases for lcp.
2004-11-13 Niels Mller <nisse@lysator.liu.se>
* src/lcp: Reviewed, and fixed some bugs. Looks at $LCP_RSH,
instead of $LCP_SSH.
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): Don't add dependency
files themselves as targets.
* misc/xenofarm.sh (status): There's no config.h in the liboop
directory, so don't try to copy it.
2004-11-12 Niels Mller <nisse@lysator.liu.se>
* misc/xenofarm.sh (--make-program): New command line option.
2004-11-09 Niels Mller <niels@s3.kth.se>
* src/lsh-krb-checkpw.c (main): Noted that the current code seems
to work only with Heimdal, not MIT kerberos.
* configure.ac: Check for krb5_verify_user_lrealm, and disable
kerberos support if not found.
2004-11-09 Niels Mller <nisse@lysator.liu.se>
* doc/lsh.texinfo: Set UPDATED-FOR to 2.0.
* misc/xenofarm.sh: Fixed typos in the oop-related tasks.
2004-11-07 Niels Mller <nisse@lysator.liu.se>
* doc/lsh.texinfo (Action options): Documented -D (socks
forwarding).
* misc/xenofarm.sh: If a liboop dist is included in the build
package, install it in $pfx before trying to build lsh.
2004-10-26 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): Need extra quoting in
case pattern.
2004-10-20 Niels Mller <niels@s3.kth.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): Disable dependency
tracking for gcc-2.
2004-10-20 Niels Mller <nisse@lysator.liu.se>
* .bootstrap: Link install-sh, texinfo.tex, COPYING and INSTALL
into the nettle subdir.
2004-10-19 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_DEPENDENCY_TRACKING): New macro.
(LSH_MAKE_CONDITIONAL): New macro.
* .bootstrap: In the nettle subdir, link acinclude.m4 as
aclocal.m4, not acinclude.m4.
2004-10-08 Niels Mller <niels@s3.kth.se>
* src/client_userauth.c (do_userauth_info_request): Enforce limits
on the length of name and instruction. Prepend the name and an
empty line to the instruction.
* src/unix_interact.c (unix_dialog): Deleted instruction argument,
display dialog->instruction instead.
* src/interact.h (interact_dialog): New instruction attribute.
(INTERACT_DIALOG): Deleted instruction argument.
* src/interact.c (make_interact_dialog): Initialize
self->instruction to NULL.
2004-10-07 Niels Mller <niels@s3.kth.se>
* src/lsh-writekey.c (main_argp_parser): When --server is given,
don't use encryption by default.
* src/testsuite/login-auth-test (LSHD_FLAGS): Use --login-shell
instead of --login-program.
* doc/lsh.texinfo: Updated for version 1.5.6.
* src/lshd.c (make_lshd_options): New default: Enable X11
forwarding.
(main_options): Deleted broken --login-program option.
* src/lsh-writekey.c (make_lsh_writekey_options): New default:
Encrypt private key using aes256-cbc.
* src/lsh-keygen.c (make_lsh_keygen_options): New default:
Generate RSA keys.
* src/testsuite/keygen-1-test: Pass -c none to lsh-writekey.
* src/testsuite/keygen-2-test: Likewise.
* src/testsuite/lsh-decrypt-key-test: Likewise.
* src/testsuite/setup-env: Likewise.
* src/testsuite/write-key-1-test: Likewise.
* src/testsuite/write-key-2-test: Likewise.
2004-10-06 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am (EXTRA_DIST): Added UTF-8-test.txt.
2004-10-05 Niels Mller <nisse@lysator.liu.se>
* src/Makefile.am (GPERF_FLAGS): Added -k21, to distinguish
diffie-hellman-group1-sha1 and diffie-hellman-group2-sha1.
* src/lsh.c (main_argp_parser): Support "diffie-hellman-group2-sha1".
* src/lshd.c (main_argp_parser): Likewise.
* src/atoms.in (diffie-hellman-group2-sha1): New name, for now an
alias to diffie-hellman-group14-sha1.
* src/testsuite/inetd-test: Start lshd with --daemon --no-syslog.
Note that this test is not yet enabled, and inetd mode not working.
* src/parse.c (parse_utf8): Keep track of the length of invalid
sequences. Moved the check for overlong sequences, not it's done
after the complete sequence is processed.
* src/charset.c (low_utf8_to_local): If utf8_tolerant is set,
replace invalid utf8 sequences with '?'. Used mainly by the
testsuite.
* src/charset.h (enum utf8_flag): New flag utf8_tolerant.
* src/testsuite/utf8-test.c: New test program.
* src/testsuite/Makefile.am (TS_PROGS): Added utf8-test.
* src/testsuite/UTF-8-test.txt: Markus Kuhn's utf8 testfile.
* src/testsuite/functions.sh: Added -q to LSHD_FLAGS again.
2004-10-02 Niels Mller <nisse@lysator.liu.se>
* src/daemon.c (daemon_started_by_inetd): More debug output.
Implemented client-side "keyboard-interactive".
* src/unix_interact.c (unix_read_password): Split off...
(read_password): New function, reads password and doesn't free
prompt.
(unix_dialog): New function.
* src/ssh.h (SSH_MSG_USERAUTH_INFO_REQUEST)
(SSH_MSG_USERAUTH_INFO_RESPONSE): New constants.
* src/server_password.c (do_authenticate): Disallow control
characters in user names.
* src/server_userauth.c (do_none_preauth): Likewise.
* src/server_publickey.c (do_authenticate): Likewise.
* src/parse.c (parse_utf8): New argument *utf8_length. Treat
overlong sequences surrigates and the non-characters 0xfffe and
0xffff as errors.
* src/lsh.c (make_lsh_login): Use keyboard-interactive, if the
other methods fail.
* src/scm/gaba.scm (make-freer): Free elements of allocated
arrays, i.e. variables of type "space".
* src/interact.h (interact_dialog): New class.
(INTERACT_DIALOG): New method.
* src/interact.c (make_interact_dialog): New function.
* src/debug.c (do_debug): Censor packets of type
SSH_MSG_USERAUTH_INFO_RESPONSE.
* src/client_userauth.c (client_password_method): Renamed class
to...
(client_userauth_interactive_method): ... Used for both "password"
and "keyboard-interactive".
(format_userauth_kbdinteract, format_userauth_info_response): New
functions.
(client_kbdinteract_state, userauth_info_request_handler): New
classes.
(do_userauth_info_request, make_userauth_info_request_handler)
(do_kbdinteract_failure, make_client_kbdinteract_state)
(do_kbdinteract_login, make_client_kbdinteract_auth): New
functions.
* src/atoms.in: Added "keyboard-interactive".
Changes to utf8 decoding.
* src/charset.h (enum utf8_flag): New enum.
* src/charset.c (utf8_to_local, low_utf8_to_local): Implemented
control character fitlering. Replaced STRICT argument with two
flags utf8_replace and utf8_paranoid.
(ucs4_is_control): New function.
(local_is_utf8): Deleted function.
* src/werror.c (werror_vformat): Improved utf8 handling. Always
convert with utf8_replace, and add utf8_paranoid in paranoia mode.
2004-09-22 Niels Mller <niels@s3.kth.se>
* acinclude.m4 (LSH_CCPIC): Don't use -fpic on cygwin.
2004-08-31 Niels Mller <nisse@lysator.liu.se>
* acinclude.m4 (LSH_CCPIC): New macro.
2004-07-16 Niels Mller <nisse@lysator.liu.se>
* src/client.c (do_background_process): Fixed C99-ism.
2004-06-22 Niels Mller <niels@s3.kth.se>
* src/parse.c (parse_utf8): Use unsigned variables.
* src/testsuite/inetd-test: New test case, not yet enabled.
2004-06-17 Niels Mller <nisse@lysator.liu.se>
* src/parse.c (parse_utf8): Check that the buffer doesn't end in
the middle of an utf8 sequence.
2004-06-15 Niels Mller <niels@s3.kth.se>
* src/version.h (SOFTWARE_SLOGAN): New macro; string appended to
the software version in the initial handshake.
* src/lsh.c (main_argp_parser): Added support for
diffie-hellman-group14-sha1.
* src/lshd.c (main_argp_parser): Likewise.
* src/dh_exchange.c (make_dh14): New function.
* src/publickey_crypto.c (zn_member): Deleted unused method.
(zn_range, zn_invert, zn_mul, zn_exp, zn_exp_ui, zn_add, zn_sub):
Non-static functions replaces the GROUP_COMBINE etc methods.
(make_group_zn, make_ring_zn): Deleted functions...
(make_ssh_group): ... replaced by new funtion.
(make_ssh_group1, make_ssh_ring_srp_1): Use make_ssh_group.
(make_ssh_group14): New function.
* src/publickey_crypto.h (abstract_group): Deleted class and
methods.
(zn_group): Declare class here, and plain functions for using it.
Replaced all uses of struct abstract_group with const struct
zn_group.
(dh_instance): Use const for the dh_method pointer.
* src/atoms.in: Added diffie-hellman-group14-sha1.
2004-06-12 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Bumped version to 1.5.6.
* Released lsh-1.5.5.
2004-06-10 Niels Mller <nisse@lysator.liu.se>
* src/keyexchange.c (parse_kexinit): Deleted unused argument
peer_flags.
* misc/Makefile.am (EXTRA_DIST): Include tsocks-forcelocal.patch.
* src/algorithms.c (lookup_hash): Deleted unused function.
(all_symmetric_algorithms): Deleted old aes alias
rijndael-cbc@lysator.liu.se. Added official serpent name
serpent256-cbc. The alias serpent-cbc@lysator.liu.se should be
removed at a later date.
(all_crypto_algorithms): Likewise.
(lookup_crypto): Likewise.
* src/atoms.in: Deleted spki-related atoms, now handled by
libspki. Also deleted pkcs5-related atoms that aren't used.
Deleted rijndael-cbc@lysator.liu.se.
2004-06-09 Niels Mller <niels@s3.kth.se>
* src/testsuite/functions.sh: Removed -q from LSHD_FLAGS.
* src/server_pty.c (SYSTEM_GROUP): New macro.
(pty_check_permissions): If there's no "tty" group, try "system".
* src/testsuite/Makefile.am (TS_SH): Removed ssh1-fallback-test.
(EXTRA_DIST): Removed fake-sshd1.
* src/testsuite/fake-sshd1, src/testsuite/ssh1-fallback-test:
Deleted files.
* src/version.h (SSH1_SERVER_PROTOCOL_VERSION): Deleted.
* src/Makefile.am (liblsh_a_SOURCES): Removed ssh1_fallback.c.
* src/lshd.c: Removed the ssh1-fallback option.
* src/handshake.c (do_line): Made the server disallow banner lines
from clients.
* configure.ac: Deleted option --with-sshd1.
* src/io.c (io_set_blocking): Deleted function.
* src/handshake.c (connection_line_handler): Deleted fd and
fallback attributes.
(make_connection_read_line): Deleted fd and fallback arguments.
(make_handshake_info): Deleted fallback argument. Updated callers.
(do_line): Deleted ssh1-fallback handling.
* src/ssh1_fallback.h, src/ssh1_fallback.c: Deleted file.
* src/handshake.h (handshake_info): Deleted fallback attribute.
* doc/lsh.texinfo (Invoking lshd): Deleted --ssh1-fallback.
* src/keyexchange.c (KEXINIT_MAX_ALGORITMS): Increased limit to
500.
(parse_kexinit): Deleted code handling of
PEER_KEXINIT_LANGUAGE_KLUDGE.
* src/handshake.c (compat_peer_flags): #if:ed out function.
* src/connection.h (enum peer_flags): Deleted constants.
* configure.ac: Deleted option --disable-datafellows-workarounds.
* src/proxy_x11forward.c (do_proxy_open_x11): Deleted code
handling PEER_X11_OPEN_KLUDGE.
2004-06-08 Niels Mller <nisse@lysator.liu.se>
* src/client.c (client_prepend_action): New function.
* src/client.c (client_options): New option --write-pid, to be
used together with -B.
(do_background_process): Optionally write the child pid to stdout.
(make_background_process): New function.
(client_argp_parser): When processing -B, pass the value of
write_pid to make_background_process.
(client_argp_parser): Handle --write-pid.
Testsuite tweaks.
* src/testsuite/lshg-1-test, src/testsuite/lshg-cat-2-test,
src/testsuite/lshg-cat-test, src/testsuite/lshg-tcpip-local-test,
src/testsuite/socks4-test, src/testsuite/socks5-test,
src/testsuite/tcpip-local-in-use-test,
src/testsuite/tcpip-local-test: Deleted unnessary sleep calls.
* src/testsuite/functions.sh (at_connect): For the
tcpip-local-in-use-test to work, we must record the mini-inetd
pid, and kill it before exiting.
* src/testsuite/functions.sh (spawn_lsh, spawn_lshg): Use new
--write-pd option and -B to start processes in the background.
* src/lsh.c (main_argp_parser): Use client_prepend_action to make
sure that the gateway is started first.
Removal of old bug-compatibility code.
* src/handshake.c: Deleted most of the bug-compatibility flags.
* src/client_userauth.c (do_userauth_pk_ok): Deleted handling of
PEER_USERAUTH_REQUEST_KLUDGE.
* src/server_publickey.c (do_authenticate): Likewise.
* src/server.c (format_service_accept_kludge): Deleted function.
(do_service_request): Deleted handling of
PEER_SERVICE_ACCEPT_KLUDGE.
* src/client.c (do_accept_service): Deleted handling of
PEER_SERVICE_ACCEPT_KLUDGE.
* src/proxy.c (do_proxy_accept_service): Likewise.
* src/dsa.c (do_dsa_verify, do_dsa_sign): Deleted handling of
ATOM_SSH_DSS_KLUDGE_LOCAL.
* src/client_keyexchange.c (do_handle_dh_reply): Deleted handling
of PEER_SSH_DSS_KLUDGE.
* src/server_keyexchange.c (do_init_server_dh): Likewise.
* src/server_publickey.c (do_authenticate): Likewise.
* src/atoms.in: Deleted ssh-dss-kludge@lysator.liu.se.
2004-06-08 Niels Mller <niels@s3.kth.se>
* src/client.c (client_options): Deleted --cvs-workaround option.
(client_argp_parser): Deleted handling of --cvs-workaround.
(fork_input): Deleted function.
(fork_output): Deleted function.
(make_client_session): Keep our original stdio fd:s in blocking
mode, and pass the type IO_STDIO to make_lsh_fd when appropriate.
(do_detach_cb): Resetting stdio to blocking mode is no longer
needed.
* src/client.h (client_options): Deleted stdin_fork, stdout_fork
and stderr_fork attributes.
* src/werror.c (set_error_nonblocking): Deleted function.
* src/server_session.c (spawn_process): Pass correct type
(IO_NORMAL or IO_PTY) to make_lsh_fd. io_set_type is no longer
needed.
* src/io.h (enum io_type): New type IO_STDIO.
* src/io.c (io_final): No longer any need to reset stdio file
descriptors to blocking mode.
(write_raw_with_poll): Deleted function.
(io_set_type): Deleted function.
(io_init_fd): New argument, allowing certain fd:s to remain in
blocking mode.
(make_lsh_fd): New argument TYPE. Updated callers.
(close_fd): Don't close fd:s that are of type IO_STDIO.
2004-04-07 Niels Mller <nisse@lysator.liu.se>
* src/server_pty.c (pty_open_slave): More verbose messages on failure.
* src/write_packet.c (do_write_packet): Deleted debug output that
may contain passwords.
2004-03-20 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Use AC_CONFIG_AUX_DIR([.]).
2004-03-18 Niels Mller <niels@s3.kth.se>
* misc/run-tests (test_program): Strip .exe suffix from name.
2004-03-17 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am (TS_SH): Run the socks4 and socks5
tests. This is pointless, and hopefully harmless, on machines that
don't have my hacked version of tsocks.
* src/socks.c (socks_reply): Send a version 4 reply, if
appropriate.
(do_read_socks): Almost implemented socks4. Handling of username
is slightly broken.
* src/testsuite/socks4-test: New file.
* src/testsuite/socks4-config: New file.
* misc/tsocks-forcelocal.patch: New file.
* misc/tsocks-forcelocal.patch: Also patch the tsocks script to
look for the library in $libdir.
2004-03-15 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/socks5-config: Added forcelocal keyword.
2004-03-01 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/functions.sh (need_tsocks): New function.
2004-03-01 Niels Mller <niels@s3.kth.se>
* acinclude.m4 (LSH_FUNC_ALLOCA): Check for malloc.h, and include
it if it exists. Needed for alloca on windows.
2004-02-29 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/socks5-config: tsocks configuration file for
socks5 test case.
* src/testsuite/socks5-test: New socks5 test.
* src/testsuite/tcpip-local-test: Check both directions of
forwarded channel.
* src/io.c (io_connect_list): Avoid resource leakage if the
address list is empty, or all connection attempts fail
immediately.
* src/socks.c (do_read_socks): Bugfix, update self->pos.
* src/client.c (client_arg_unsigned): Typo fix.
* src/lshg.c (main_options): Deleted short options -I and -D. The
corresponding long options --send-debug and --send-ignore remains.
* src/socks.c (do_read_socks): Fixed bugs in parsing of client's
first message.
2004-02-27 Niels Mller <nisse@lysator.liu.se>
* src/client.c (client_argp_parser): New command line option -D,
--forward-socks.
(client_arg_unsigned): New function.
* src/lshd.c: Don't include tcpforward_commands.h.
* src/tcpforward_commands.c (make_open_tcpip_command): Made non-static.
(open_direct_tcpip): Moved declaration back here, reverting
yesterday's change.
* src/tcpforward_commands.h: Deleted file. Prototypes moved to...
* src/tcpforward.h: ...here.
* src/socks.c: Rewritten. A successful connect should transform
the control channel into a data channel.
* src/process_atoms: Added extra quotes needed to get the length
of "*" into atoms_table.c.
* src/lsh.c (main): make_lsh_connect now returns a struct command *, so
can delete one CAST_SUBTYPE.
* src/channel_forward.c (channel_forward_start_io_read): New function.
2004-02-26 Niels Mller <nisse@lysator.liu.se>
* src/lsh_string.c (lsh_string_ntop): Use const void * for the
input.
* src/tcpforward_commands.h (open_direct_tcpip,
OPEN_DIRECT_TCPIP): Moved declarations here...
* src/tcpforward_commands.c: ... from here.
* src/socks.c: New file.
* src/Makefile.am (liblsh_a_SOURCES): Added socks.c.
* src/scm/gaba.scm (process-expr): Let the generated code return a
struct command *, not a struct lsh_object *.
* src/dummy.c (cbc_encrypt, cbc_decrypt): Use nettle_crypt_func
for typing.
2004-02-25 Niels Mller <nisse@lysator.liu.se>
* misc/xenofarm.sh (cfgwarn, makewarn, ckprgwarn): Renamed
variables log, warn and fail.
2004-02-24 Niels Mller <nisse@lysator.liu.se>
* misc/xenofarm.sh (dotask): Fixed handling of $var.
(cfgwarn, makewarn, ckprgwarn): Use $task when constructing
filenames.
* misc/xenofarm.sh: Fixed tasks argpmake and nettlemake. New tasks
ckargp and cknettle.
* src/Makefile.am (lshg_SOURCES, lshg_LDADD): Avoid linking with
nettle. Need to link with dummy.o instead.
* src/dummy.c: New file.
* misc/xenofarm.sh (cfgargs): Add the flags we want to use to cfgargs.
(dotask): New optional argument with the name of the status variable.
2004-02-20 Niels Mller <nisse@lysator.liu.se>
* src/process_atoms: Fixes to make it work with Solaris /bin/sh.
Replaced uses of echo -n with printf(1), and ${#foo} with `expr
$foo : '.*'`.
2004-02-20 Niels Mller <niels@s3.kth.se>
* src/scm/Makefile.am (EXTRA_DIST): Deleted make-char-classes.
* configure.ac: Deleted tests for bash.
* src/Makefile.am (atoms_gperf.c, atoms_table.c): Don't use
bash to run process_atoms script.
(packet_types.h): Don't use bash to run the invert-defs script.
2004-02-19 Niels Mller <niels@s3.kth.se>
* src/scm/guile-compat.scm: Deleted most of the contents.
* src/scm/make-char-classes.scm: Deleted obsolete file.
2004-02-18 Niels Mller <niels@s3.kth.se>
* src/Makefile.am (prime_table.h, sexp_table.h, digit_table.h):
Deleted rules for building obsolete files.
2004-02-18 Pontus Skld <pont@soua.net>
* src/process_atoms: Converted script from bash to /bin/sh.
2004-02-17 Niels Mller <nisse@lysator.liu.se>
* src/unix_user.c (do_lookup_user) [!HAVE_SHADOW_H]: Enable shadow
database code only if shadow.h can be included.
* src/unix_process.c (do_logout_notice): Deleted gratious
semicolon at end of function definition.
(do_utmp_cleanup): Use UTMPX_UT_EXIT___E_TERMINATION and
UTMPX_UT_EXIT_UT_TERMINATION.
* configure.ac: Check for ut_exit.__e_termination and
ut_exit.ut_termination in struct utmp and struct utmpx.
2004-02-16 Niels Mller <niels@s3.kth.se>
* configure.ac: Added gss-related configure checks (patch from
Simon Josefsson).
2004-02-15 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am (AM_CPPFLAGS): Need -I.., in order to
include nettle-types.h.
* src/unix_user.c (do_lookup_user): Just ignore shadow database if
getspnam returns NULL.
* src/lsh.h: #include nettle/types.h instead of inttypes.h.
* src/atoms.h: #include lsh.h instead of inttypes.h.
* src/charset.h: Likewise.
* src/tty.h: Likewise.
* src/testsuite/testutils.h: Likewise.
* configure.ac: Bumped version to 1.5.5.
2004-02-13 Niels Mller <niels@s3.kth.se>
* src/ssh.h: Added GSSAPI constants (patch from Simon Josefsson).
* src/atoms.in: New symbol "gssapi".
2004-02-12 Niels Mller <nisse@lysator.liu.se>
* src/io.c (address_info2sockaddr) [!HAVE_GETADDRINFO]: Updated
code to work with new string abstraction.
2004-02-12 Niels Mller <niels@s3.kth.se>
* configure.ac: No space between "-I" and include directories.
2004-02-08 Niels Mller <nisse@lysator.liu.se>
* Released lsh-1.5.4.
Implemented flow control for the connections write_buffer. The
buffer is now of limited size. When it starts to get large, channel
i/o is disabled. If it hits the limit, the connection is closed.
* src/connection.c (WRITE_BUFFER_MAX, WRITE_BUFFER_MARGIN): New
constants.
(connection_flow_controlled): New class.
(do_connection_flow_controlled): Reenable channel i/o when we have
room in the write buffer.
(make_ssh_connection): Initialize ssh_connection attributes
wakeup, soft_limit and hard_limit.
(connection_init_io): Changed argument type from struct
abstract_write to struct lsh_fd. Install flow control on the
socket's write_buffer. Deleted the randomness argument, and don't
call make_packet_write. This way, both handshake_command and
gateway_make_connection can call this function.
(connection_wakeup): New function, which installs a wakeup
callback on the connection.
(connection_send_kex): Compare the size of the write_buffer to the
soft and hard limits.
(connection_send_kex_end): Invoke wakeup callback, if it's
non-NULL.
* src/connection.h (ssh_connection): New attribute socket,
replaces old attribute raw. New attributes hard_limit and
soft_limit.
* src/read_data.c (do_read_data_query): Stop reading, if
connection->hard_limit is set, indicating an almost full
write_buffer for the connection.
* src/handshake.c (handshake_command): Adapt to changed
connection_init_io. Use connection->socket instead of
connection->raw.
* src/gateway_commands.c (gateway_make_connection): Use
connection_init_io, so that flow control is set up properly.
* src/channel.c (window_adjust_handler): Deleted redundant assert.
(do_channels_after_keyexchange): Renamed to do_channels_wakeup. No
longer needs to reinstall the handler.
(init_connection_service): Use connection_wakeup, not
connection_after_keyexchange.
2004-02-07 Niels Mller <nisse@lysator.liu.se>
* install-sh: Removed from CVS repository. Let automake supply it.
* acinclude.m4 (LSH_FUNC_ALLOCA): Include <alloca.h>, if
available, also when compiling with gcc.
2004-01-08 Niels Mller <nisse@lysator.liu.se>
* src/rsync/rsync.h: Don't include inttypes.h, just let
<nettle/md5.h> define uint8_t and other types.
* src/Makefile.am (AM_CPPFLAGS): Added -I./nettle. Needed to find
the nettle-types.h include file when building outside of the
source directory.
(packet_types.h): Changed rule to use $< to refer to the input
file.
* src/testsuite/Makefile.am (AM_CPPFLAGS): Added -I../nettle.
* src/rsync/Makefile.am (AM_CPPFLAGS): Added -I../nettle.
2004-01-08 Niels Mller <niels@s3.kth.se>
* src/tcpforward.c (do_channel_open_direct_tcpip): Log
direct-tcpip request.
(do_tcpip_forward_request): Log forward-tcpip request.
2004-01-08 Niels Mller <nisse@harpo.hack.org>
* configure.ac: No space between "-L" and library directories.
2004-01-07 Niels Mller <nisse@harpo.hack.org>
* acinclude.m4 (AX_CREATE_STDINT_H): Copied macro definition from
http://ac-archive.sourceforge.net/guidod/ax_create_stdint_h.html.
2003-11-18 Niels Mller <niels@s3.kth.se>
* src/unix_process.c (utmp_book_keeping) [UTMPX_UT_SYSLEN]: Use
lsh_string_length.
2003-11-17 Niels Mller <nisse@harpo.hack.org>
* src/read_packet.c (class read_packet): New attribute
mac_computed.
(lsh_string_realloc): Deleted function.
(do_read_packet, make_read_packet): Allocate block_buffer,
mac_buffer and mac_computed at creation time, using
SSH_MAX_BLOCK_SIZE and SSH_MAX_MAC_SIZE.
* src/ssh.h (SSH_MAX_BLOCK_SIZE, SSH_MAX_MAC_SIZE): New constants,
with the implementations's maximum block size and mac size.
2003-11-16 Niels Mller <nisse@harpo.hack.org>
* src/lsh-writekey.c (main_argp_parser): Move declaration to
support C90.
* src/Makefile.am (liblsh_a_SOURCES): Added lsh_string.c.
* src/lsh_string.c, src/lsh_string.h: New files, with a private
string implementation. The point is that no other code should
write directly into strings or other buffers.
* src/gateway_commands.c (class read_gateway_packet): Use an
lsh_string for the header buffer, not a plain char array.
* src/read_line.c (class read_line): Likewise, for the line buffer.
* src/write_buffer.h, src/write_buffer.c (class write_buffer):
Likewise for the output buffer.
* src/pkcs5.c (pkcs5_derive_key): Take lsh_string arguments, and
return key as an lsh_string. Also use lsh_strings internally,
instead of plain char buffers.
* src/format.c (ssh_format_write, ssh_vformat_write)
(format_hex_string, format_decimal, write_decimal_length): Take a
lsh_string and position for the destination. Updated to use
functions from lsh_string.c. Moved some functions to lsh_string.c.
(lsh_string_colonize): Use const for input string. Use
lsh_string_putc.
(lsh_string_bubblebabble): Use lsh_string_putc. No need for
explicit NUL-termination. Use const for input string.
* src/format.c (ssh_format): Changed definition of %r, now stores
the start position of the reserved area, not a pointer. Updated
all callers.
* src/lock_file.c, src/lsh-make-seed.c, src/server_session.c,
src/server_x11.c: #include lsh_string.h.
* src/spki.c (spki_hash_data): Rewritten to use hash_digest_string
instead of hash_digest.
* src/testsuite/testutils.c (decode_hex): Use const for input.
Also other updates for lsh_string changes.
* src/zlib.c (do_zlib): Use lsh_string_zlib. Updated for
lsh_string changes.
* src/werror.c (werror_decimal): Rewrote to not use
format_decimal.
(werror_hexdump): Use const for input.
(werror_vformat): Updated for lsh_string changes.
* src/unix_user.c (kerberos_check_pw, do_verify_password): Updated
for lsh_string changes.
* src/unix_interact.c (unix_yes_or_no): Updated for lsh_string
changes.
* src/string_buffer.h (struct string_buffer): Replaced current
pointer with an integer position.
* src/string_buffer.c: Updated for lsh_string changes.
* src/spki.c (spki_pkcs5_encrypt): Use const for input argument.
* src/server_userauth.c (do_handle_userauth): Updated for
lsh_string changes.
* src/server_publickey.c (do_authenticate): Updated for lsh_string
changes.
* src/server_pty.c (pty_open_slave): Updated for lsh_string changes.
* src/read_file.c (do_read_file): Updated for lsh_string changes.
* src/parse_config.c: #include lsh_string.h.
* src/lsh.h: Removed declarations for lsh_string. This is now
provate to lsh_string.c. Only kept a forward declaration of struct
lsh_string, and a declaration of lsh_string_free.
* src/lsh-export-key.c (encode_base64): Use lsh_string.c functions.
* src/lsh-decrypt-key.c (main): Updated for lsh_string changes.
* src/lsh-decode-key.c (main): Use lsh_string_base64_decode.
* src/io.c (do_consuming_read, io_read_file_raw): Use lsh_string_read.
(do_write_callback): Updated for lsh_string changes.
(sockaddr2info): Use lsh_string_ntop.
* src/handshake.c (compat_peer_flags, split_version_string)
(do_line): Use const for input strings.
* src/read_line.h (class line_handler): Use a const for the
handler method.
* src/dsa.c (make_ssh_dss_verifier): Use a lsh_string for the
input. Updated for lsh_string changes.
* src/rsa.c (make_ssh_rsa_verifier): Likewise.
* src/publickey_crypto.h: Updated prototypes.
* src/sexp.c (lsh_sexp_format): Function renamed to
lsh_string_format_sexp, and moved to lsh_string.c. Updated
callers.
* src/daemon.c (daemon_pidfile): Updated for lsh_string changes.
* src/client_keyexchange.c (do_handle_dh_reply): Updated for
lsh_string changes.
* src/client.c (rebuild_command_line): Use lsh_string_write.
* src/charset.c: Updated for lsh_string changes.
(low_utf8_to_local): Use const for input.
* src/xalloc.c: Removed string related functions. Moved to
lsh_string.c.
* src/gc.c (gc): Use lsh_get_number_of_strings to access string
counter.
(gc_final): Call lsh_string_final_check.
* src/abstract_crypto.h (CRYPT): Changed method to take an
lsh_string and an index for source and destination. Also changed
the order of source and destination arguments.
(MAC_DIGEST): Take a lsh_string and index for the destination.
* src/crypto.c: Rewrote cipher classes to use functions in
lsh_string.c, instead of writing directly into the output string.
(hash_digest_string): New function.
(hash_digest): New function.
(do_hmac_digest): Use lsh_string_write_hmac.
* src/channel.c: Updated for lsh_string changes.
* src/client_escape.c: Likewise.
* src/client_userauth.c: Likewise.
* src/client_x11.c: Likewise.
* src/connection.c: Likewise.
* src/debug.c: Likewise.
* src/dh_exchange.c: Likewise.
* src/keyexchange.c: Likewise.
* src/lsh-writekey.c: Likewise.
* src/lsh.c: Likewise.
* src/read_packet.c: Likewise.
* src/server.c: Likewise.
* src/spki.c: Likewise.
* src/srp-gen.c: Likewise.
* src/srp_exchange.c: Likewise.
* src/tcpforward.c: Likewise.
* src/tty.c: Likewise.
* src/unix_process.c: Likewise.
* src/unix_random.c: Likewise.
* src/write_packet.c: Likewise.
* src/xauth.c: Likewise.
2003-11-11 Niels Mller <nisse@harpo.hack.org>
* src/Makefile.am (liblsh_a_SOURCES): Deleted unpad.c.
* src/xalloc.c (lsh_object_free): Changed to take a const argument.
* src/read_packet.c (do_read_packet): Moved code for stripping
padding and inflating read packets to this function.
* src/handshake.c (do_line): Deleted calls to make_packet_unpad
and make_packet_inflate.
* src/unpad.c, src/unpad.h: Deleted files.
* src/compress.c (class packet_compressor): Deleted class.
(make_packet_codec): Deleted function.
* src/compress.h (make_packet_deflate, make_packet_inflate):
Deleted macros.
2003-11-10 Niels Mller <nisse@harpo.hack.org>
* src/connection.c (connection_send_kex): New function, replacing
macro C_WRITE_NOW. Updated all callers.
* src/read_file.h: Deleted file. Moved declarations to...
* src/abstract_io.h: ... here. Deleted all inclusions of read_file.h.
2003-11-09 Niels Mller <nisse@harpo.hack.org>
* src/debug.h: Deleted file. Moved declarations to...
* src/connection.h: ... here. Deleted all inclusions of debug.h.
2003-11-08 Niels Mller <nisse@harpo.hack.org>
* src/Makefile.am (liblsh_a_SOURCES): Removed pad.c, encrypt.c.
Added write_packet.c.
* src/compress.c (do_packet_inflate): Keep sequence number.
* src/pad.c, src/pad.h, src/encrypt.c, src/encrypt.h: Deleted
files.
* src/write_packet.c: New file and function, to replace pad.c and
encrypt.c.
* src/client.c, src/connection.c: Don't include pad.h and encrypt.h.
* src/connection.h: Prototype for make_write_packet.
* src/connection.c (connection_init_io): Use make_write_packet.
2003-10-30 Niels Mller <nisse@harpo.hack.org>
* src/connection.h (C_WRITE): Deleted macro. Updated all callers
to use connection_send directly.
Changed gateway protocol, to not use any extra padding.
* src/gateway_commands.c (do_read_gateway): New function
(make_read_gateway): New function.
(do_gateway_pad): New extra padding.
(gateway_make_connection): No need to call make_packet_unpad.
* src/abstract_io.h (class read_handler): Use a const uint8_t *
argument for the handler method.
* src/read_file.c (do_read_file): Const argument.
* src/read_line.c (do_read_line): Likewise.
* src/read_packet.c (do_read_packet): Likewise.
2003-10-23 Niels Mller <niels@s3.kth.se>
* src/server_userauth.c: Rewrote comment about userauth
serialization.
* src/io.c (close_fd): Deleted fd = -1 special case.
* src/connection.c (connection_lock, connection_unlock): Simplified.
(do_exc_connection_handler): Deleted handling of
EXC_PAUSE_CONNECTION and EXC_PAUSE_START_CONNECTION.
* src/exception.h (EXC_PAUSE_CONNECTION)
(EXC_PAUSE_START_CONNECTION): Deleted exception types.
* src/dsa_keygen.c, src/rsa_keygen.c: Deleted files. Moved the
dsa_generate_key and rsa_generate_key functions to ...
* src/lsh-keygen.c: ... here.
* src/dsa.c (generic_dsa_verify): Deleted function.
(generic_dsa_sign): Likewise.
2003-10-22 Niels Mller <niels@s3.kth.se>
* src/client_x11.c (client_x11_auth_info): Deleted commented out
class.
* src/server_session.c (do_alloc_pty): Return channel in question.
(do_window_change_request): Likewise.
(do_spawn_subsystem): Likewise.
* src/gateway_channel.c (do_gateway_channel_request): Added FIXME
on returned value.
* src/server_x11.c (do_xauth_exit): Likewise.
* src/client.c (do_exit_status): Return the channel in question to
the continuation.
(do_exit_signal): Likewise.
* src/channel.c (channel_request_continuation): Expanded FIXME
comment.
* src/parse.h: Include nettle/bignum.h instead of bignum.h.
* src/format.h: Don't include bignum.h.
* src/keyexchange.h: Likewise.
* src/publickey_crypto.c: Likewise.
* src/werror.h: Likewise.
* src/dh_exchange.c (dh_generate_secret): Use nettle_mpz_random.
Needs inclusion of nettle/bignum.h.
* src/bignum.c, src/bignum.h: Deleted files.
* src/Makefile.am (liblsh_a_SOURCES): Deleted bignum.c
* configure.ac: Bumped version to 1.5.4.
* src/interact.h (INTERACT_READ_PASSWORD): Deleted the forth
argument FREE. Now the prompt string is always consumed. Updated
all callers.
* src/unix_interact.c (unix_read_password): Deleted fourth
argument FREE.
* src/lsh.h: Forward declaration of catch_report_collect.
* src/channel_forward.h: ... and deleted corresponding declaration
here.
* src/abstract_compress.c, src/abstract_compress.h: Deleted files.
Moved contents to...
* src/compress.c, src/compress.h: ... here. Updated users.
* src/Makefile.am (liblsh_a_SOURCES): Removed abstract_compress.
2003-10-10 Niels Mller <niels@s3.kth.se>
* src/unix_user.c (do_read_file_fail): Return the created
exception.
* src/lshd.c (main_argp_parser): Use getenv(ENV_LOGNAME), not
getenv("LOGNAME").
2003-10-05 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (read_user_keys): Display error message for missing
identity file only in verbose mode. Suggested by Thomas
Krennwallner.
2003-09-27 Niels Mller <nisse@cuckoo.hack.org>
* src/gateway_channel.c (do_channel_open_forward): Moved creation
of ORIGIN channel object from here...
(do_gateway_channel_open_continuation): ... to here.
(make_gateway_channel_open_continuation): Deleted ORIGIN argument.
* src/channel.c (channel_open_handler): Bugfix for the case that
alloc_channel fails.
2003-09-26 Niels Mller <nisse@cuckoo.hack.org>
* src/channel.c (login_service_command): Deleted redundant command.
* src/lshd.c (main_options): #if:ed out login-auth-mode-user.
(main_argp_parser): For login-auth-mode, we don't need a user
database. Instead use make_unix_user_self and
make_userauth_none_permit.
(install_session_handler): New command.
(lshd_login_service): Take the "session" channel open handler as
argument. We don't need a general list of connection hooks. Use
init_connection_service, not the reduntant init_login_service.
(make_lshd_login_service): Simplified a little.
* src/server_userauth.c (do_none_preauth,
server_userauth_none_preauth): Userauth "none" handler which
succeeds only if the user was authenticated during key exchange.
(userauth_none_permit): New class.
(do_none_permit): Userauth "none" handler which always succeeds.
(make_userauth_none_permit): New function.
(userauth_none): Deleted class.
(do_none_authenticate, make_userauth_none): Deleted functions.
* src/unix_user.c (chdir_home): Deleted function.
(exec_shell): Take separate arguments for shell, home, name, uid
and gid, not a struct unix_user.
(spawn_error, spawn_parent, spawn_child): New helper functions,
broken out of do_spawn.
(do_spawn): Use helper functions.
(unix_user_self): New class.
(do_verify_password_fail, do_file_exists_fail, do_read_file_fail):
Dummy methods.
(do_spawn_self): Spawn method for unix_user_self class.
(make_unix_user_self): New function.
(unix_current_user): Deleted function.
2003-09-25 Niels Mller <niels@s3.kth.se>
* src/io.c (do_connect_list_callback): Fixed error message. errno
is not valid here.
2003-09-25 Pontus Skld <pont@soua.net>
* src/channel.c (login_service_command): Use
init_connection_service instead of init_login_service.
(init_login_service): Removed redundant function.
2003-09-22 Niels Mller <nisse@cuckoo.hack.org>
* README: Updated the instructions for building from CVS. List
tcputils as a program needed for the testsuite.
2003-09-20 Niels Mller <nisse@cuckoo.hack.org>
* misc/mkdiff: Copied mkdiff script from the old lsh_1_2_BRANCH.
2003-09-19 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.5.3.
* src/channel.c (init_login_service): Added FIXME: for the purpose
of this function.
* src/io.c (close_fd): Added FIXME: on the fd->fd == -1 hack.
2003-09-19 Niels Mller <niels@s3.kth.se>
* configure.ac: Bumped version to 1.5.3.
* src/client_keyexchange.c (do_handle_srp_reply): Fixed missing
returns after disconnect_kex_failed and PROTOCOL_ERROR.
* src/client_userauth.c (do_exc_userauth_disconnect): Clarified
comment.
* src/channel_commands.c (do_channel_open_command): Added missing
return EXCEPTION_RAISE. Fixed also in 1.4.3.
* src/testsuite/Makefile.am (TS_SH): Fixed syntax error.
* src/testsuite/lshd-random-input-test: New test case that
connects to lshd and sends some random data.
2003-09-18 Niels Mller <nisse@cuckoo.hack.org>
* src/read_line.c (do_read_line): Fixed buffer overrun bug,
initially reported by Bennett Todd. Fixed also in stable branch.
2003-09-18 Niels Mller <nisse@lysator.liu.se>
* distribution-key.gpg: Updated key, new signatures and new expire
date.
2003-09-16 Pontus Skld <pont@soua.net>
* src/lsh-writekey.c (main): Check that the given key isn't empty.
* src/lsh-upgrade-key: Set a restrictive umask. Encrypted keys are
no longer stored unencrypted in a temporary file, just piped
through the conversion chain like unencrypted keys are.
* src/lsh-writekey.c (process_private): Moved reading of
passphrase here.
(main_argp_parser): Reading of passphrase from tty is now done in
process_private if required.
* src/testsuite/lshd-no-auth-test: New test to verify lshd fails
gracefully when it may use no authentication method.
* src/testsuite/Makefile.am (TS_SH): Use new lshd-no-auth-test.
2003-09-15 Pontus Skld <pont@soua.net>
* src/testsuite/Makefile.am (TS_SH): Use new test for login-auth
mode.
* src/testsuite/login-auth-test: New test for login-auth mode.
* src/lshd.c: New defines OPT_LOGIN_AUTH_USER,
OPT_OPT_NO_LOGIN_AUTH_MODE, OPT_LOGIN_AUTH_USER and
OPT_BANNER_FILE.
(lshd_options): New attributes with_loginauthmode,
loginauthmode_user and banner_file.
(make_lshd_options): Initialize new attributes.
(main_options): New options for login-auth-mode and banner-file.
(main_argp_parser): Make a userdb if using login-auth-mode too.
Bugfix; make sure self->userauth_algorithms is initialized, even
if we're using srp. Add a permissive userauth_none to
self->userauth_algorithms if using login-auth mode. Handle new
options.
(lshd_login_service): New class.
(make_lshd_login_service): New function.
(make_lshd_listen_callback): Read banner-file and pass as a string
to make_handshake_info is desired.
(main): Use the login service in login-auth mode.
* src/server_userauth.c (userauth_none): New class.
(do_none_authenticate): Added code for login-auth-mode to
auto login a specific user.
(make_userauth_none): New function.
* src/server_userauth.h (make_userauth_none): Declaration, removed
static userauth_none.
* src/unix_user.c (unix_current_user): New function, return
username of current user.
* src/lsh.c (main): Pass extra NULL to make_handshake_info.
* src/handshake.c (make_handshake_info): New parameter
banner_text, init attribute.
* src/handshake.h (handshake_info): New attribute banner_text.
(make_handshake_info): New parameter.
* src/channel.h: Declarataions for init_login_service,
login_service_command annd INIT_LOGIN_SERVICE.
* src/channel.c (init_login_service): New function to setup a
login service.
(login_service_command): Command to setup a connection for login
service.
2003-08-17 Niels Mller <nisse@cuckoo.hack.org>
* src/scm/gaba.scm (out): Ignore #f entries.
(process-class): New keyword condition, for preprocessor
conditionals.
2003-06-28 Niels Mller <nisse@cuckoo.hack.org>
* src/zlib.c (do_zlib): Changed messages from verbose to debug, to
reduce clutter.
2003-06-12 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.5.2
2003-06-10 Niels Mller <niels@s3.kth.se>
* src/lsh.c (read_known_hosts): Fixed error message when host-acls
doesn't exist.
* src/testsuite/lsh-decrypt-key-test (fname, keyname): Store files
in $TEST_HOME.
2003-06-06 Niels Mller <nisse@cuckoo.hack.org>
* src/Makefile.am (EXTRA_DIST): Added lsh-upgrade-key.
2003-06-06 Pontus Skld <pont@soua.net>
* src/lsh-upgrade-key: New script to upgrade keys.
* src/Makefile.am (bin_SCRIPTS): Added lsh-upgrade-key.
2003-06-05 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/lsh-encrypted-key-test: The lsh-authorize script
is located in the source directory.
* src/unix_interact.c (unix_read_password): Added trace messages.
(unix_set_askpass): Added trace message. Assert that askpass is
non-NULL.
* src/spki.c (spki_pkcs5_decrypt): Cosmetic fix of warning message.
* src/lsh.c (read_user_keys): Cosmetic fix of trace message.
* src/client.c (client_argp_parser): Fixed --askpass option. The
argp parser should never use optarg.
2003-06-05 Niels Mller <niels@s3.kth.se>
* src/unix_interact.c (unix_read_password): Prompt for password
only if we have a tty, and the quiet flag is unset.
2003-06-05 Pontus Skld <pont@soua.net>
* src/lsh-decrypt-key.c: New file to provide new utility
lsh-decrypt-key.
* src/Makefile.am (bin_PROGRAMS): Added new utility
lsh-decrypt-key.
* src/testsuite/lsh-decrypt-key-test: New test to test
lsh-decrypt-key.
* src/testsuite/Makefile.am (TS_SH): Use new lsh-decrypt-key-test.
2003-06-05 Niels Mller <nisse@lysator.liu.se>
* src/io.c (io_resolv_address): In the code using getaddrinfo,
zero the sockaddr_in first using memset, to ensure that
sockaddr_in.sin_zero really is zero, on the systems (e.g. AIX)
that need that.
2003-06-04 Niels Mller <niels@s3.kth.se>
* src/testsuite/lsh-encrypted-key-test: Use printf instead of echo
in the askpass helper program. There should be no trailing newline
character.
* src/lsh-krb-checkpw.c: Include <string.h>.
* src/unix_interact.c (unix_read_password): The askpass code
leaked the prompt string. Fixed.
* src/spki.c (spki_pkcs5_decrypt): The label string was leaked.
Fixed.
2003-06-04 Niels Mller <nisse@cuckoo.hack.org>
* src/spki.c (spki_pkcs5_encrypt): The method identifier is
"Xpkcs5v2", not "xpkcs5v2".
(spki_pkcs5_decrypt): Rewrote function.
(parse_pkcs5, parse_pkcs5_payload): New helper functions for
spki_pkcs5_decrypt.
2003-06-03 Pontus Skld <pont@soua.net>
* src/testsuite/Makefile.am (TS_SH): Added lsh-encrypted-key-test.
* src/testsuite/lsh-encrypted-key-test: Test for encrypted
(password protected) key functionality in lsh.
2003-06-01 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (do_listen_callback): To get enough space, PEER must be
a sockaddr_in (if the IPv6 type sockaddr_storage isn't available).
(fd2info): Likewise.
2003-05-24 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-make-seed.c: Fixed nesting of WITH_ZLIB #if:s. Also
disable the zlib code.
* misc/xenofarm.sh: Use cp in stead of mv, when putting files into
the result package.
* src/server_x11.c (server_x11_setup): Don't use non-constant
initializer. Sun cc doesn't support it.
2003-05-22 Niels Mller <niels@s3.kth.se>
* src/testsuite/Makefile.am: Don't use -O0 in AM_CFLAGS, as it
breaks the AIX build.
2003-05-21 Niels Mller <niels@s3.kth.se>
* src/reaper.c (do_reaper_callback): Check if WCOREDUMP is defined
before using it.
2003-05-20 Niels Mller <niels@s3.kth.se>
* src/unix_interact.c (unix_read_password): Fixed argv bug for the
askpass program.
* src/client.c: Implemented --askpass option.
* src/unix_interact.c (unix_read_password): Use any specified
askpass program. Deleted the password_fd code.
(unix_set_askpass): New function.
(make_unix_interact): Initialize askpass and set_askpass.
* src/interact.h (INTERACT_SET_ASKPASS): New method.
* src/io.c (lsh_popen_read): Improved warning messages.
* configure.ac: If seteuid is not available, but setresuid is,
let config.h #define seteuid in terms of setresuid.
2003-05-19 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c (do_read_file): Set the process gid, and reset
the supplimentary groups list, before opening the file.
* configure.ac: Check for seteuid and setresuid.
2003-05-16 Niels Mller <niels@s3.kth.se>
* configure.ac: Check for struct utmp.ut_exit.e_termination and
struct utmpx.ut_exit.e_termination.
* src/unix_process.c (do_utmp_cleanup): Fix for HPUX, which uses
non-standard names for the fields of struct utmpx's ut_exit.
2003-05-14 Niels Mller <niels@s3.kth.se>
* src/io.c (io_resolv_address): More fixes for the non getaddrinfo
code.
2003-05-14 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_interact.c (unix_interact): New attribute password_fd.
(unix_read_password): Read password from password_fd, unless it's
-1.
(make_unix_interact): Initialize password_fd to -1.
2003-05-13 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (io_resolv_address): Fixes for the non getaddrinfo
code.
2003-05-13 Niels Mller <niels@s3.kth.se>
* acinclude.m4 (LSH_FUNC_STRSIGNAL): Use a dummy STRSIGNAL if none
of strsignal, sys_siglist or _sys_siglist exists.
* src/io.c (lsh_popen_read): Use STRSIGNAL macro.
2003-05-12 Niels Mller <nisse@cuckoo.hack.org>
* src/crypto.h (FOR_BLOCKS): Deleted unused macro.
* src/lsh-execuv.c: Don't include lsh_types.h.
* src/lsh-krb-checkpw.c: Likewise.
* src/lsh.c (do_lsh_lookup): Fix syntax of generated ACL entries
(bug 1030).
* misc/make-am (environ_deps): Deleted code for generating
.dist_deps.
* src/.dist_headers: Deleted memxor.h and lsh_types.h.
* src/.dist_headers, src/.dist_classes: Deleted proxy-related
files.
* configure.ac: Updated AC_CONFIG_SRCDIR, as lsh_types.h no longer
exists.
2003-05-12 Niels Mller <niels@s3.kth.se>
* configure.ac: Don't AC_REPLACE_FUNCS(memxor), just use the
memxor function in nettle.
* doc/HACKING: Documented current include file ordering rules.
* src/lsh.h (MAX, MIN, SQR, STRING_LINE): Moved miscellaneous
macros here. Used to be in lsh_types.h.
* Reordered includes in most or all .c-files. All should now
include config.h.
* src/lsh_types.h: Deleted file.
* src/.dist_deps: Deleted file.
* src/memxor.h, src/memxor.c: Deleted files.
* src/Makefile.am (BUILT_SOURCES): Use BUILT_SOURCES to get
environ.h built. .dist_deps no longer needed.
* acinclude.m4 (LSH_GCC_FUNCTION_NAME, LSH_FUNC_ALLOCA)
(LSH_FUNC_STRERROR, LSH_FUNC_STRSIGNAL): New macros.
* configure.ac: Use them.
2003-05-12 Pontus Skld <pont@soua.net>
* src/lsh-upgrade: Upgrade any authorized public keys and
re-authorize them.
2003-04-23 Niels Mller <niels@s3.kth.se>
* src/Makefile.am (gcov-list): Don't include files with full code
coverage in the list.
* src/testsuite/Makefile.am (TS_SH): Added
tcpip-local-in-use-test.
2003-04-22 Niels Mller <niels@s3.kth.se>
* src/tcpforward_commands.c (forward_local_port): Use prog1 to
delay bind call until the connection is established.
* src/testsuite/tcpip-local-in-use-test: New test case, to check
the error handling for "address already in use".
* src/unix_user.c (exec_shell): Build the argument list for
lsh-execuv only if we need to change uid. Include the name of the
exec:ed program if exec fails.
* src/lsh.c (main): Use addr_queue instead of sockaddr_list.
* src/lshd.c: Likewise.
* src/io_commands.c (connect_list_command): Take a
connect_list_state as argument.
* src/io.h (connect_list_state): Moved class definition to the
header file.
* src/io.c (sockaddr_cons): Deleted function.
(io_resolv_address) Use addr_queue instead of sockaddr_list.
(io_listen_list): Likewise.
(connect_attempt): Likewise.
(make_connect_list_state): Made non-static.
(connect_list_callback): Moved c and e attributes here, from
connect_list_state.
(io_connect_list): Take a connect_list_state as argument.
* src/queue.c (make_addr_queue_node): Initialize the size field.
* src/queue.h (struct lsh_queue): Added length field.
* src/queue.c: New queue type addr_queue, for handling lists of
sockaddr:esses. Let lsh_queue keep track of the length.
* src/lsh.c (do_lsh_lookup): Deleted old code handling the
ssh-rsa-pkcs1@lysator.liu.se algorithm id.
2003-04-22 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (lsh_verifier_command): Deleted command.
(make_lsh_login): New function, replacing lsh_login_command.
(make_lsh_userauth): Deleted GABA-expression.
(make_lsh_connect): Take a login command as a parameter.
(main): Updated calls to make_lsh_connect and make_lsh_login.
2003-04-21 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (make_lsh_connect): Take actions as a parameter.
(options2service): Deleted command.
(lsh_options): Deleted service attribute. Always ask for the
userauth service.
(make_lsh_userauth): Deleted expression.
(make_lsh_connect): Take keys as parameter. Always ask for
userauth service.
(main): Deleted call of make_lsh_userauth. Pass keys to
make_lsh_connect instead.
* src/lshg.c (make_lshg_connect): Likewise.
* src/gateway.c: Include string.h.
* src/client.c (client_options2actions): Deleted command.
* src/io.c (make_address_info_c): Deleted function.
2003-04-20 Niels Mller <niels@s3.kth.se>
* src/spki.c (make_ssh_hostkey_tag): Use a plain NUL-terminated
string to identify the host.
(spki_pkcs5_decrypt): Fixed string leak. The label string wasn't
freed properly on failure.
* src/lshd.c (do_exc_lshd_handler): It seems we need an exception
handler after all, which catches and logs i/o errors.
* src/lsh.c (options2identities): Deleted command.
(lsh_host_db): Use a NUL-terminated string to identify the host.
(do_lsh_lookup): Likewise.
(make_lsh_host_db): Likewise.
(make_lsh_userauth): Take keys as a parameter. Don't use
options2identities.
(make_lsh_connect): Take options as a parameter, and the remote
address list as argument. Use connect_list.
(main): Call io_resolv_address, read_known_hosts, read_user_keys
and make_lsh_userauth here.
* src/io_commands.c (connect_list_command): New command.
* src/io.c (do_connect_list_callback): Update fd->label.
* src/handshake.c (handshake_command): Allow a NULL lv->peer.
* src/gateway.c (make_gateway_address): Take a plain
NUL-termianted string to identify the target.
* src/client.c (client_options2remote): Deleted command.
(client_argp_parser): Don't call make_address_info_c.
* src/client.h (client_options): Replaced remote attribute with a
plain NUL-termianted string, and renamed to target.
* src/lshg.c: Updated for the struct client_options renaming
remote->target.
* src/testsuite/functions.sh (spawn_lshd): Reduced sleep.
2003-04-16 Niels Mller <niels@s3.kth.se>
* src/lshd.c (main): No need to check for make_lshd_options
returnning NULL.
* src/.dist_classes (dist_classes): Deleted io_commands.h.x.
* src/io_commands.h (io_write_file_info): Deleted class.
* src/io_commands.c (io_write_file_command)
(make_io_write_file_info): Deleted unused functions.
* src/lshd.c (do_exc_lshd_handler, make_lshd_exception_handler):
Deleted functions.
* src/exception.h (EXC_RANDOMNESS_LOW_ENTROPY, EXC_APP): Deleted
unused exceptions.
* src/io.c (io_read_file): Deleted unused function.
* src/testsuite/functions.sh (spawn_lshd): Check exit code from
lshd. Print out the lshd pid.
(spawn_lsh): Print out the lsh pid.
* src/Makefile.am (gcov-list): New target for running gcov.
* src/io_commands.c (listen_list_command): Deleted command.
Replaced by the io_listen_list function.
* src/lshd.c (options2local, options2keys, options2tcp_wrapper)
(close_on_sighup): Deleted commands.
* src/keyexchange.c (kexinit_filter): Deleted command.
* src/lshd.c (main): Reorganization, do more work before io_run,
including reading host keys and binding sockets directly in main.
Moved the daemonization later, so that the forground process
doesn't exit until after the ports are bound.
Fixed an fd leak in the server tcpip-forwarding code.
* src/tcpforward.c (do_tcpip_forward_request_continuation): Use
remember_resource to associate the bound fd to the connection.
(make_tcpip_forward_request_continuation): New argument,
connection.
(do_tcpip_forward_request): Pass the connection to
make_tcpip_forward_request_continuation.
* src/io.c (io_listen_list): New function.
2003-04-15 Niels Mller <niels@s3.kth.se>
* src/testsuite/functions.sh (spawn_lshd): Use -HUP, not -9, for
killing lshd.
* src/werror.c (fatal) [WITH_GCOV]: Call fork, so that we can
call exit() and also dump core.
* src/server.c (read_host_key): Fixed string leak.
* src/io.c (make_connect_callback): Made non-static.
(io_connect): Changed interface, to take an io_callback instead of
a continuation. The caller has to use make_connect_callback to get
the old functionality.
(io_connect_local): Adapted to new io_connect interface, and call
make_connect_list_callback.
* src/client_x11.c (channel_open_x11): Likewise.
* src/io_commands.c (do_connect): Likewise.
* src/io.c (connect_list_state): New class.
(do_connect_list_kill): New function.
(make_connect_list_state): New function.
(connect_attempt): New function.
(connect_list_callback): New class.
(do_connect_list_callback): New function.
(make_connect_list_callback): New function.
(io_connect_list): New function.
* src/io.h (sockaddr_list): Renamed attribute, addr -> address.
* configure.ac: New option --enable-profiling.
* src/.gdbinit: New file.
2003-04-14 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (io_resolv_address): Changed interface, to avoid local
conversion of service names to port numbers. This way, all that's
needed for SRV-records is proper support in getaddrinfo.
* src/lshd.c (parse_interface): Changed interface to use plain
NUL-terminated strings.
(main_argp_parser): Updated for new io_resolv_address interface.
2003-04-14 Niels Mller <niels@s3.kth.se>
* src/testsuite/functions.sh: Use INTERFACE=localhost, as we now
support non-numerical interface names.
(spawn_lshd): Must put -p option before --interface.
* src/lshd.c (parse_interface): New function.
(main_argp_parser): Implemented multiple --interface options.
(make_lshd_listen): Use listen_list, to list on severala ddresses
in parallel. Don't use the bind command.
* src/io.c (io_resolv_address): Changed return type, now returns
the number of resolved addresses.
* doc/lsh.texinfo (Invoking lshd): Document the use of multiple
--interface options.
2003-04-13 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (EXTRA_PROGRAMS): Added testutils, as
a kludge to get automake to track dependencies for testutils.o.
* src/io_commands.c (listen_list_command): New command.
* src/io.h (sockaddr_list): New class.
* src/io.c (io_resolv_address): New function.
(sockaddr_cons): New function.
* src/client_session.c (make_client_session_channel): Added place
holder for send break escape handler (#if:ed out for now)
2003-04-11 Niels Mller <niels@s3.kth.se>
* src/client_pty.c (do_kill_client_tty_resource): Call
set_error_raw.
(do_pty_continuation): Likewise.
* src/client_escape.c (escape_help): New class.
(do_escape_help): Escape function that lists all defined escapes.
(make_escape_help): New function.
(make_escape_info): Install help.
(escape_dispatch): Updated to use the escape_callback type.
* src/client.c: Use DEFINE_ESCAPE.
* src/suspend.c (suspend_callback): Likewise.
* src/client.h (escape_callback): New class, which inherits
lsh_callback and adds a help string.
(class escape_info): Use it.
(DEFINE_ESCAPE): New macro.
* src/werror.c (set_error_raw): New function, for telling the
werror functions when the tty is set to raw mode.
(werror_putc): In raw mode, add a \r before each \n.
(werror_write_raw): Renamed the old werror_write function.
(werror_write): New function that inserts \r in the output when
approrpriate.
* src/Makefile.am (MAINTAINERCLEANFILES, class-map): Updated to
use dist_classes, not dist_x_files.
2003-03-24 Pontus Skld <pont@soua.net>
* contrib/solpkg.sh.in: Added my script to create Solaris
packages.
* contrib/Makefile.am: Include script in EXTRA_DIST
* configure.ac: Added hooks for Solaris package script.
2003-03-14 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (handle_nonblock_error): New function, ignoring ENODEV
errors. Needed for freebsd, where setting the non-block flag on
/dev/null fails.
(io_set_nonblocking, io_set_blocking): Use handle_nonblock_error.
2003-03-13 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (io_set_nonblocking, io_set_blocking)
(io_set_close_on_exec): Fixed error messages.
2003-03-05 Niels Mller <nisse@cuckoo.hack.org>
* configure.ac: Bumped version to 1.5.2.
* src/testsuite/Makefile.am (LDADD): Use DOTDOT_LIBARGP, instead
of the GNU make specific addprefix function.
* configure.ac (DOTDOT_LIBARGP): New substitution
2003-03-04 Niels Mller <nisse@cuckoo.hack.org>
* misc/xenofarm.sh (make): Don't use -k flag, it seems to mask
errors.
* src/Makefile.am (environ.h): Avoid requiring GNU make for this
rule.
2003-03-02 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_random.c: Include <sys/time.h> before <sys/resource.h>.
* src/io.c: Include <sys/wait.h>, not <wait.h>.
2003-03-01 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-upgrade: Note that we need to upgrade private keys too.
2003-02-28 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.5.1.
* src/spki.c (spki_pkcs5_decrypt): Typo fix, it's
"password-encrypted", not "password_encrypted".
2003-02-27 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/rapid7-lsh-test: ln -sf is not portable, so delete
the symlink "current" explicitly using rm.
2003-02-27 Niels Mller <niels@s3.kth.se>
* src/testsuite/rapid7-lsh-test: Skip test if tcputils is missing.
* src/testsuite/rapid7-lshd-test: Likewise.
2003-02-27 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/rapid7-lshd-test: Use $srdir for locating the test
pdu:s.
* src/testsuite/rapid7-lsh-test: Likewise.
2003-02-26 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/rapid7-lsh-test: Bugfixes, and some adaption to
the lsh testsuite framework.
* src/testsuite/rapid7-lshd-test: Likewise.
* src/testsuite/functions.sh (werror, die): New functions.
2003-02-26 Pontus Skld <pont@soua.net>
* src/lsh-krb-checkpw.c: Include config.h if available.
2003-02-25 Niels Mller <niels@s3.kth.se>
* src/testsuite/Makefile.am (AM_CPPFLAGS): Use $(srcdir)/..
* src/testsuite/.dist_rapid7: Typo fix.
2003-02-25 Niels Mller <nisse@cuckoo.hack.org>
* src/rsync/Makefile.am (AM_CPPFLAGS): Use $(srcdir)/..
2003-02-24 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (TS_SH): Added rapid-7-lsh-test and
rapid-7-lshd-test.
(EXTRA_DIST): Use $(dist_rapid7), and include .dist_rapid7 which
defines it.
* src/testsuite/.dist_rapid7: New file, listing rapid7 files.
* rapid7-ssh-pdu: New directory, containing rapid7's testsuite.
* configure.ac: Bumped version to 1.5.1.
* src/rsync/Makefile.am: Use AM_CPPFLAGS = -I.. to get include
files in the main src directory.
* src/testsuite/Makefile.am: Likewise.
* configure.ac: Use AC_GNU_SOURCE. Don't add -I$srcdir/src -DLSH
to CPPFLAGS.
* src/lsh.c (read_known_hosts): Fixed the message about old
known_hosts files.
2003-02-23 Niels Moller <nisse@carduelis>
* src/scm/gaba.scm (main): Simplified. Explicitly use echo,
otherwise scsh-0.6 seems to return a non-zero exit code.
* acinclude.m4 (LSH_GCC_ATTRIBUTES): New macro, copied from lsh's
configure.ac.
* configure.ac: Use it.
* .bootstrap: Link acinclude.m4 to argp and sftp subdirectories.
2003-02-19 Niels Mller <nisse@cuckoo.hack.org>
* src/nettle/acinclude.m4, src/spki/acinclude.m4: Deleted files,
let .bootstrap make links to the top-level acinclude.m4 instead.
* acinclude.m4: Renamed macros to start with the LSH_-prfix.
Deleted unused code. Updated configure.ac to match.
(LSH_TYPE_SOCKLEN_T): Moved AH_TEMPLATE into the macro body.
* .bootstrap: Link acinclude.m4 into the src/nettle and src/spki
directories. Added command line option "links", that skips the
autoconf and automake bootstrap.
* misc/Makefile.am (EXTRA_DIST): Removed bootstrap.sh. Added
make-am.
* Makefile.am (EXTRA_DIST): Added .bootstrap.
* doc/Makefile.am (EXTRA_DIST): Don't distribute Makefile.am.in.
(%.txt): Resurrected the rule for building txt from nroff. Needed
for srp-spec.txt.
* src/Makefile.am (EXTRA_DIST): Likewise.
* .bootstrap: New link from src/nettle/examples and
src/sftp/testsuite to run-tests.
2003-02-18 Niels Mller <nisse@cuckoo.hack.org>
* src/Makefile.am (bootstrap): Bootstrap the spki dirctory too.
(EXTRA_DIST): dist_x_files and cvs_headers renamed to dist_classes
and dist_headers.
* doc/Makefile.am (EXTRA_DIST): Deleted man_MANS.
* misc/bootstrap.sh: Deleted old bootstrap file.
* src/.dist_classes, src/.dist_headers: Reformatted so that they
can be included directly in the Makefile.
* src/.dist_deps: Dependencies on environ.h.
* misc/run-tests: Moved testsuite driver here, and symlink it from
all directories that need it.
* misc/make-am: New script, for generating the files
src/.dist_headers, src/.dist_classes and src/.dist_deps. Replaces
* make_am, src/used_headers, src/cvs_headers: Deleted files.
* .bootstrap: Bugfixes.
* Makefile.am.in: Removed all these files. Use plain Makefile.am
instead.
2003-02-18 Niels Mller <niels@s3.kth.se>
* configure.ac: Added check for inet_ntop in -lnsl.
Check for -lnsl before checking for -lsocket, to avoid strange
confusion with Solaris' library dependencies.
2003-02-17 Niels Mller <nisse@cuckoo.hack.org>
* misc/xenofarm.sh: Fixed make --version test.
2003-02-17 Niels Mller <niels@s3.kth.se>
* misc/xenofarm.sh: Make sure PATH is exported.
Redirect stderr output from make --version.
2003-02-17 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/testutils.c: Use uint32_t and friends, not UINT32.
* misc/xenofarm.sh (cfgwarn): Fixed sed expression.
2003-02-16 Niels Mller <nisse@cuckoo.hack.org>
* src/.dist_classes: Deleted read_base64.c.x.
* src/.dist_headers: Deleted digits.h
* src/debug.c (send_debug, send_verbose): Deleted unused funtions.
* .bootstrap: New file, to replace misc/bootstrap.sh.
* General cleanup. Use types uint32_t and friends instead of
UINT32. Include files in the order config.h, C headers, system
headers, lsh headers. Deleted RCS id strings. Affects most files.
* src/digits.h, src/read_base64.c: Deleted obsolete file.
* src/Makefile.am.in (liblsh_a_SOURCES): Removed read_base64.c.
* configure.ac: Added missing LSH_RPATH_FIX between the checks for
gmp and liboop.
Use AH_BOTTOM to define NORETURN, PRINTF_STYLE and UNUSED.
2003-02-15 Niels Mller <nisse@cuckoo.hack.org>
* src/io.h (lsh_fd): Deleted old hanged_up attribute.
* src/gateway_commands.c (gateway_setup_command): Deleted old
#if:ed out command.
* src/format.c (ssh_vformat_length): Deleted some old #if:ed out
code.
* src/io.c (do_buffered_read): Likewise.
* src/xalloc.c (lsh_object_free): Likewise.
* src/proxy.c (do_proxy_offer_service): Likewise.
* src/io_commands.h: Deleted old prototypes make_listen_local and
make_connect_local.
2003-02-14 Niels Mller <niels@s3.kth.se>
* src/Makefile.am.in (bin_SCRIPTS): Added lsh-upgrade.
2003-02-12 Niels Mller <niels@s3.kth.se>
* src/unix_user.c (do_spawn): Added FIXME on error reporting.
* misc/xenofarm.sh (cfgwarn): Delete warning about using an
absolute path for srcdir.
2003-02-11 Niels Mller <niels@s3.kth.se>
* misc/xenofarm.sh: Compile with make -k.
2003-02-10 Niels Mller <nisse@cuckoo.hack.org>
* src/.dist_classes: Deleted lsh_proxy.c.x and sexp-conv.c.x.
* src/dsa.c (do_dsa_sign): Use tokens in format string to
lsh_sexp_format.
* src/dsa_keygen.c (dsa_generate_key): Likewise.
* src/lsh.c (do_lsh_lookup): Likewise.
* src/srp_exchange.c (srp_make_verifier): Likewise.
* src/rsa_keygen.c (rsa_generate_key): Likewise.
* src/rsa.c (do_rsa_public_spki_key): Likewise.
* src/spki.c (spki_pkcs5_encrypt, make_ssh_hostkey_tag)
(spki_hash_data): Likewise.
* src/sexp-conv.c, src/sexp_test.c: Deleted file, not used
anymore.
* misc/xenofarm.sh: Collect config.h files from subdirectories.
2003-02-09 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (TS_PROGS): Added sockaddr2info-test.
* src/testsuite/testutils.h: Include io.h.
* src/testsuite/sockaddr2info-test.c: New test case.
* src/io.c (sockaddr2info): Use inet_ntop for formatting AF_INET6
addresses.
2003-02-07 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (do_lsh_lookup): The public key should be wrapped in a
subject expression in the generated acl:s.
* src/io.c (sockaddr2info): #ifed out broken IPv6 code.
2003-02-06 Niels Mller <niels@s3.kth.se>
* src/Makefile.am.in (DISTCLEANFILES): Delete environ.h.
* src/testsuite/conv-3-test: Updated test for current sexp-conv.
* misc/xenofarm.sh: Try to add /usr/local/bin and /usr/ccs/bin to
PATH, if needed.
2003-02-05 Niels Mller <nisse@cuckoo.hack.org>
* src/keyexchange.c (KEXINIT_MAX_ALGORITMS_SUN): New constant.
(parse_kexinit): Added argument peer_flag. Use larger list limit
than parsing the language lists from Sun's sshd.
(do_handle_kexinit): Updated call to parse_kexinit.
* src/handshake.c: Added workaround for "Sun_SSH_1.0".
* src/connection.h: New constant PEER_KEXINIT_LANGUAGE_KLUDGE.
2003-02-04 Niels Mller <nisse@cuckoo.hack.org>
* Moved argp-related entries from this file to src/argp/ChangeLog.
2003-01-27 Niels Mller <nisse@cuckoo.hack.org>
* src/rsa_keygen.c, src/rsa.c: Updated for nettle rsa renaming.
* configure.ac: Fixed syntax error when testing $x_includes and
$x_libraries.
2003-01-24 Niels Mller <nisse@cuckoo.hack.org>
* configure.ac: --with-lib-path should add to LDFLAGS, not replace
it.
* misc/xenofarm.sh (dotask cfg): Pass --with-include-path and
--with-lib-path to configure. On some systems /usr/local/lib and
/usr/local/include are not searched by default.
2003-01-22 Niels Mller <nisse@cuckoo.hack.org>
* src/spki.c (spki_add_acl): Use spki_acl_process.
(spki_authorize): Adapted to changed spki_acl_by_subject_first and
spki_acl_by_subject_next.
2003-01-21 Niels Mller <niels@s3.kth.se>
* misc/xenofarm.sh: Don't run make distcheck, as it leaves some
write-protected directories in the tree.
2003-01-20 Niels Mller <niels@s3.kth.se>
* misc/xenofarm.sh: Dont cd into src before running make check and
make distcheck.
* src/testsuite/functions.sh (need_tcputils): Use test_skip.
* misc/xenofarm.sh (timeecho): Fixed typo.
2003-01-19 Niels Mller <nisse@cuckoo.hack.org>
* misc/xenofarm.sh (timeecho): Set LC_ALL=C before calling date.
* src/testsuite/functions.sh (need_tcputils): New function. Use it
in the testcases that depend on tcputils: tcpip-local-test,
tcpip-remote-test, lshg-tcpip-test and ssh1-fallback-test.
2003-01-17 Niels Mller <niels@s3.kth.se>
* src/Makefile.am.in: Added explicit dependencies for objects
depending on environ.h. Must figure out some better way to do
that.
2003-01-16 Niels Mller <niels@s3.kth.se>
* src/Makefile.am.in (EXTRA_DIST): Added environ.h.in.
(generated_sources): Don't list environ.h here, as it's system
dependent.
* misc/xenofarm.sh: Fixed invocation of dotask, which should take
four arguments.
(dotask): Don't create $task.pass, they're not used anymore.
2003-01-15 Niels Mller <nisse@cuckoo.hack.org>
* misc/xenofarm.sh: Updated to use new format for reporting the
result.
2003-01-14 Niels Mller <nisse@lysator.liu.se>
* src/.dist_classes: sexp.h.x has disappeared.
* misc/bootstrap.sh: Bootstrap spki subdir. Removed redundant
automake calls.
2003-01-14 Niels Mller <nisse@cuckoo.hack.org>
* misc/xenofarm.sh: New file.
Added build instructions, following the lyskom-server example.
* src/.dist_classes: hmac.c.x, md5.c.x and sha.c.x have
disappeared.
2003-01-14 Niels Mller <nisse@lysator.liu.se>
* configure.ac (AC_PATH_X): Check not only $no_x, also check if
$x_includes and $x_libraries are empty before adding new flags.
* src/scm/gaba.scm (nth): New function. The elisp/Common
Lisp/MACLisp style function, which takes the index as the first
argument.
(make-output): Updated call of nth.
* src/scm/guile-compat.scm (nth): Deleted function. Needed for
scsh, not just guile.
2003-01-14 Niels Mller <nisse@cuckoo.hack.org>
* src/.dist_classes: sexp.c.x and spki.c.x have disappeared.
* src/.dist_headers: dsa.h has disappeared.
2003-01-13 Niels Mller <nisse@cuckoo.hack.org>
* src/.dist_headers, src/.dist_classes: Check into cvs, to make it
easier for xenofarm to build a distribution directly from cvs.
2003-01-13 Niels Mller <nisse@lysator.liu.se>
* src/scm/compiler.scm (let-and): Fixed syntax error in
syntax-rules.
* misc/bootstrap.sh: Use plain automake -a, no extra arguments.
2003-01-12 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c: Use macros in environ.h, when defining
environment veriables.
* src/lshd.c: Use PATH_KERBEROS_HELPER, defined in environ.h.
* src/environ.h.in: Define a bunch of PATH_* and ENV_* constants.
* src/client.c: Include environ.h, and use those macros for all
getenv calls.
* src/client_pty.c: Likewise.
* src/gateway.c: Likewise.
* src/lsh-keygen.c: Likewise.
* src/lsh-make-seed.c: Likewise.
* src/lsh-writekey.c: Likewise.
* src/lsh.c: Likewise.
* src/server_session.c: Likewise.
* src/server_x11.c: Likewise.
* src/srp-gen.c: Likewise.
* src/unix_random.c: Likewise.
* src/xauth.c: Likewise.
* src/Makefile.am.in (environ.h): Fixed commands.
(generated_sources): Added environ.h.
* doc/lsh.texinfo (Files and environment variables): Document
POSIXLY_CORRECT.
* configure.ac: Don't try AC_DEFINE:ing PREFIX and SBINDIR. Those
substitutions are now performed at make-time.
2003-01-10 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (read_known_hosts): Display upgrade message only if
the --host-db option wasn't used.
Changed user messages to say "host-acls" instead of "known_hosts".
2003-01-10 Niels Mller <niels@s3.kth.se>
* src/lsh-upgrade: New shell script.
* src/testsuite/testutils.c (test_spki_match): Rewrote to use the
new spki functions. Always fail on parse errors.
* src/testsuite/spki-tag-test.c (test_main): Include the leading
"(tag ..." in the tested expressions.
* src/testsuite/Makefile.am (LDADD): Added libspki.a.
* src/spki.c (make_ssh_hostkey_tag): Include the outer "(tag ...)"
expression.
(spki_add_acl): New function.
(spki_lookup): Fixed some compile time errors.
(spki_authorize): Likewise.
* src/lsh.c (read_known_hosts): Don't read known_hosts any more,
just display a warning message saying that it needs conversion.
(read_known_hosts): spki_add_acl now takes an spki_iterator.
(do_lsh_lookup): The access expression includes the complete tag
expression, not just the body of it.
* src/lsh-pam-checkpw.c: Include config.h.
* src/Makefile.am.in (LDADD): Add libspki.a.
2003-01-09 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (read_known_hosts): Display a message if an old
known_hosts file is used.
* src/daemon.c (daemon_init): Fork once more, to lose process
session leadership.
* src/spki.c: Deleted old spki implementation.
(spki_lookup, spki_authorize): New functions.
(do_spki_acl_db_mark, do_spki_acl_db_free): New functions.
* src/lsh.c (read_known_hosts): Read new known-hosts file as
"~/.lsh/host-acls", and filter it through sexp-conv. Fall back to
the old file name "~/.lsh/known_hosts" if the new file doesn't
exist.
(do_lsh_lookup): Use the new spki_lookup function.
(do_lsh_lookup): Use new spki_authorize function.
(do_lsh_lookup): Disable spki fingerprinting for now.
* src/io.c (lsh_popen): New argument for recording the child pid.
(lsh_popen_read): New function.
* doc/lsh.texinfo (Files and environment variables): Document
SEXP_CONV.
2003-01-08 Niels Mller <niels@s3.kth.se>
* src/Makefile.am.in (environ.h): New rule for creating environ.h
from environ.h.in.
2003-01-02 Niels Mller <nisse@cuckoo.hack.org>
* src/Makefile.am.in (SUBDIRS): Compile in spki subdir.
* configure.ac: Configure subdir src/spki.
2003-01-02 Niels Mller <niels@s3.kth.se>
* src/io.c (lsh_popen): New function.
2003-01-02 Pontus Skld <pont@soua.net>
* configure.ac: Check for alarm.
* src/lsh-pam-checkpw.c (main): Set an alarm to exit after TIMEOUT
(currently 600) seconds.
* src/lsh-krb-checkpw.c (main): Dito.
2002-12-11 Niels Mller <niels@s3.kth.se>
* src/lsh-writekey.c (process_private): If no encryption, dup the
input string.
2002-12-04 Niels Mller <nisse@cuckoo.hack.org>
* src/dsa.c (do_dsa_sign): Use %0s, not %z, when formatting
s-expressions.
(do_dsa_public_spki_key): Likewise.
* src/spki.c (spki_pkcs5_encrypt): Likewise.
(make_ssh_hostkey_tag): Likewise.
(spki_hash_data): Likewise.
* src/rsa_keygen.c (rsa_generate_key): Likewise.
* src/rsa.c (do_rsa_public_spki_key): Likewise.
* src/lsh.c (do_lsh_lookup): Likewise.
* src/dsa_keygen.c (dsa_generate_key): Likewise.
2002-11-16 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/key-1.private, src/testsuite/key-2.private:
Updated keys.
* src/testsuite/conv-1-test, src/testsuite/conv-2-test,
src/testsuite/dsa-test.c, src/testsuite/export-1-test,
src/testsuite/rsa-test.c: Updated key s-expressions to match new
format. Positive numbers must start with an octed with the most
significant bit zero.
* src/srp_exchange.c (srp_hash_password): Use
nettle_mpz_set_str_256_u.
(make_srp_entry): Check sign of verifier.
* src/spki.c (spki_pkcs5_decrypt): Use sexp_iterator_get_uint32.
* src/sexp.c (lsh_sexp_to_uint32): Deleted function (similar
function added to nettle, sexp_iterator_get_uint32).
* src/rsa.c (do_rsa_verify): Use nettle_mpz_set_str_256_u.
* src/parse.c (parse_bignum): Use nettle_mpz_set_str_256_s.
* src/format.c (ssh_vformat_length): Use nettle's bignum
functions.
(ssh_vformat_write): Likewise.
* src/dsa.c (do_dsa_verify): Use nettle_mpz_set_str_256_u.
(dsa_blob_length): Use nettle_mpz_sizeinbase_256_u.
(dsa_blob_write): Use nettle_mpz_get_str_256.
* src/bignum.c (limbs_to_octets): Deleted function.
(bignum_parse_s): Deleted function.
(mpz_size_of_complement): Deleted function.
(bignum_format_s_length): Deleted function.
(bignum_format_s): Deleted function.
(bignum_parse_u): Deleted function.
(bignum_format_u_length): Deleted function.
(bignum_write): Deleted function.
(bignum_format_u): Deleted function.
(bignum_random_size): Made static.
(bignum_random_size): Use nettle_mpz_set_str_256_u.
* src/Makefile.am.in (lshg_LDADD): lshg needs to be linked with
nettle now, that the bignum functions used by ssh_format have
moved there. It should be possible to get lshg to work without
either nettle or gmp, currently it won't.
2002-11-13 Niels Mller <niels@s3.kth.se>
* src/spki.c (do_spki_authorize): Need braces around
FOR_OBJECT_QUEUE loop.
2002-11-11 Niels Mller <nisse@cuckoo.hack.org>
* src/Makefile.am.in (noinst_PROGRAMS): Don't build prime_table.
* src/digit_table.c: Deleted file.
* src/prime_table.c: Deleted file.
* src/sexp_parser.c: Deleted file.
* src/digits.c: Deleted file.
* src/bignum.c (bignum_small_factor): Deleted function.
(bignum_next_prime): Deleted function.
(bignum_random_prime): Deleted function.
* src/lsh-decode-key.c (main): Use nettle's functions for base64
decoding.
* src/Makefile.am.in: Don't build digit_table.h.
(liblsh_a_SOURCES): Removed digits.c.
2002-11-10 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (do_lsh_default_handler): Deleted handling of obsolete
exception types EXC_SEXP_SYNTAX and EXC_SPKI_TYPE.
* src/lshd.c (do_exc_lshd_handler): Likewise.
* src/srp_exchange.c (srp_make_verifier): Adapted to new sexp
code.
(make_srp_entry): Likewise.
* src/srp-gen.c: Adapted to new sexp code.
* src/server_keyexchange.c (do_server_srp_read_verifier):
Adapted to new sexp code.
* src/server_authorization.c (do_key_lookup): Adapted to new sexp
code.
* src/server.c (read_host_key): Adapted to new sexp code.
* src/rsa_keygen.c (rsa_generate_key): Adapted to new sexp code.
* src/lshd.c: Adapted to new sexp code.
* src/lsh.c (read_known_hosts): Adapted to new sexp code.
(read_user_keys): Likewise.
(do_lsh_lookup): Likewise.
* src/lsh-keygen.c: Adapted to new sexp code.
* src/lsh-writekey.c: Likewise.
* src/lsh-decode-key.c: Adapted to new sexp code.
* src/testsuite/testutils.c (test_sign): Adapted to new sexp code.
(test_spki_match): Likewise.
* src/spki.h (spki_exception): Deleted class.
* src/spki.c: Adapted to new sexp code.
(make_spki_exception): Deleted function.
(spki_make_public_key): Deleted function, the PUBLIC_SPKI_KEY
method can be used directly.directly.
(spki_hash_sexp): Deleted function.
(subject_match_hash): #if:ed out function for now.
(spki_subject_by_hash): Likewise.
(do_spki_lookup): #if:ed out lookup by hash.
(spki_algorithm_lookup): New function.
(spki_get_type): Deleted, moved similar code to sexp.c.
* src/exception.h (EXC_SEXP, EXC_SPKI): Deleted SEXP and
SPKI-related exceptions.
* src/sexp.c: Rewrote using nettle's sexp functions.
* src/sexp.h: Matching rewrite of declarations.
* src/rsa.c (encode_rsa_sig_val): Deleted function.
(decode_rsa_sig_val): Deleted function.
(spki_init_rsa_verifier): Deleted function.
(make_rsa_verifier_internal): Deleted function.
(do_rsa_verify): Adapted to new sexp code.
(do_rsa_public_spki_key): Likewise.
(do_rsa_sign): Likewise.
(make_rsa_verifier): Use rsa_keypair_from_sexp_alist.
(make_rsa_signer): Likewise.
* src/publickey_crypto.h: Added dsa declarations (used to be in
dsa.h).
* src/lsh.h: Removed forward declaration of sexp structs.
* src/lsh-export-key.c (encode_base64): New function (was in
sexp.c earlier).
(sexp_to_ssh2_key): Adapted to new sexp code.
* src/lsh-authorize: Use new sexp-conv program. Check exit status
of sexp-conv.
* src/dsa_keygen.c (dsa_generate_key): Adapted to new sexp code.
* src/dsa.h: Deleted file.
* src/dsa.c (make_dsa_verifier_internal): Deleted function.
(encode_dsa_sig_val): Deleted function.
(decode_dsa_sig_val): Deleted function.
(do_dsa_verify): Adapted to new sexp code.
(do_dsa_public_spki_key): Return a string, in canonical or
transport syntax.
(make_dsa_verifier): Use nettle's dsa_keypair_from_sexp_alist.
(make_dsa_signer): Likewise.
* src/abstract_crypto.h (PUBLIC_SPKI_KEY): Changed method, now
returns a string and takes an extra argument to say if it should
use transport syntax.
* src/Makefile.am.in (bin_PROGRAMS): Don't build sexp-conv.
(sbin_PROGRAMS): Don't build lsh_proxy.
* src/testsuite/lsh-6-test (LSHD_FLAGS): Bugfix, test_success was
used improperly, making the testcase always succeed.
* src/testsuite/keygen-1-test: Use $SEXP_CONV.
* src/testsuite/keygen-2-test: Likewise.
* src/testsuite/functions.sh (SEXP_CONV): Use nettle's sexp-conv
program.
* src/testsuite/conv-1-test: Use $SEXP_CONV, with explicit line
width.
* src/testsuite/conv-2-test: Use $SEXP_CONV.
* src/testsuite/conv-3-test: Skip test for now, new sexp-conv
doesn't support hex output.
* src/testsuite/Makefile.am (check): Set LD_LIBRARY_PATH when
running tests.
2002-11-07 Niels Mller <niels@s3.kth.se>
* configure.ac: Don't use quotes with AM_CONFIG_HEADER, it seems
to confuse automake.
Bugfix: Don't generate nettle/Makefile here.
* src/testsuite/functions.sh: Tolerate unset failing.
2002-11-04 Pontus Skld <pont@soua.net>
* src/testsuite/functions.sh: Unset LSHGFLAGS and LSHFLAGS.
* src/client.c (envp_parse): Certain versions of argp needs to be
fed with ARGP_NO_ERRS for this to work.
* misc/Makefile.am.in: Removed obsolete reference to (and include
of) ctags.mk.
* doc/Makefile.am.in: Removed inclusion of ctags.mk.
2002-11-03 Niels Mller <nisse@cuckoo.hack.org>
* misc/Makefile.am.in: Don't include ctags.mk.
* src/testsuite/testutils.c (test_sign): Use SIGN and VERIFY, not
the obsolete methods SIGN_SPKI and VERIFY_SPKI.
* src/testsuite/Makefile.am (AM_CFLAGS): Use AM_CFLAGS to disable
optimization. Don't set CFLAGS explicitly.
* misc/ctags.mk: Deleted file. Not needed anymore, since automake
supports ctags it out of the box.
* Makefile.am.in: Don't include ctags.mk.
* src/Makefile.am.in: Likewise.
* src/rsa_keygen.c (get_random): Deleted function. Replaced by ...
* src/randomness.c (lsh_random): New function.
* src/rsa.c (do_rsa_verify): Recognize algorithm "spki".
(do_rsa_sign): Likewise.
(do_rsa_verify_spki): Deleted function.
(do_rsa_sign_spki): Likewise.
* src/dsa_keygen.c (dsa_generate_key): Rewrote to use nettle's
dsa_generate_keypair function.
2002-11-02 Niels Mller <nisse@cuckoo.hack.org>
* src/dsa.c (dsa_hash): Deleted function.
(generic_dsa_verify): Rewrote to use nettle's dsa_verify.
(do_dsa_verify_spki, do_dsa_sign_spki): Deleted method.
(generic_dsa_sign): Rewrote to use nettle's dsa_sign.
(dsa_blob_length): Use struct dsa_signature for the argument.
(dsa_blob_write): Likewise.
(encode_dsa_sig_val): Likewise.
(decode_dsa_sig_val): Likewise.
(make_dsa_signer): Use dsa_private_key_init.
(class dsa_verifier): Use nettle's struct dsa_public_key.
(class dsa_signer): Use nettle's struct dsa_private_key.
(do_dsa_verify): Recognize algorithm "spki".
(do_dsa_sign): Likewise.
* src/bignum.c (bignum_write): Use const.
* src/atoms.in: New atom "spki", for generic spki operations.
* src/abstract_crypto.h (SIGN_SPKI, VERIFY_SPKI): Deleted methods
used only by the testsuite.
2002-11-01 Pontus Skld <pont@soua.net>
* src/testsuite/Makefile.am (TS_SH): New test lsh-9-test.
* src/testsuite/lsh-9-test: Test for LSHFLAGS.
* src/client.h (client_options): New attribute, inhibit_actions.
Declaration of envp_parse.
* src/client.c (envp_parse): New function envp_parse.
(client_argp_parser): Honour inhibit_actions.
(init_client_options): Initialize inhibit_actions.
* src/lshg.c (main_argp_parser): Honour inhibit_actions.
(main): Use envp_parse.
* src/lsh.c (main_argp_parser): Honour inhibit_actions.
(main): Use envp_parse.
2002-10-23 Pontus Skld <pont@soua.net>
* src/client_x11.c (parse_display): Handle special case
DISPLAY=unix:x.y for local delivery.
* src/client.c (do_detach_cb): New function replacing
do_detach_cb_first and do_detach_cb_second.
(do_detach_cb_first): Deleted.
(do_detach_cb_second): Deleted.
(make_detach_callback): Use new function stead of
do_detach_cb_first.
2002-10-22 Pontus Skld <pont@soua.net>
* src/client.c: Include io.h.
(detach_callback): New class to handle detachment and
synchronization with fds.
(detach_resource): New class used for synchonization with channel
disappearance.
(do_detach_res_kill): Kill method for detach_resource.
(make_detach_resource): New function.
(do_detach_cb_second): New function that does the actual
detaching.
(do_detach_cb_first): Callback for synchronization with fds.
(make_detach_callback): New function.
(init_client_options): Set options->detach_end to 0 (detachment
disabled by default).
(client_options): Help message for detach and no-detach.
(make_client_session): If options->detach_end, make a callback for
stdout and set a resource on the channel to synchronize. Also
reset options->detach_end to 0 (so it only affects one action).
(client_argp_parser): Handle detach and no-detach.
* src/client.h: New variable in client_options: detach_end.
2002-10-03 Niels Mller <nisse@cuckoo.hack.org>
* configure.ac: Use AC_SEARCH_LIBS instead of AC_CHECK_LIB when
looking for libnsl, so we don't pick it up unless it really is
needed.
2002-10-02 Pontus Skld <Pontus.Skold@dis.uu.se>
* src/lshd.c: Include <sys/resource.h> if it exists.
(main): setrlimit to raise max number of open files
if available.
* configure.ac: Check for <sys/resource.h> and setrlimit.
2002-10-02 Pontus Skld <Pontus.Skold@dis.uu.se>
* configure.ac: Don't AC_PATH_PROG for bash, m4 and groff if
given. Made them precious.
2002-10-01 Niels Mller <niels@s3.kth.se>
* src/testsuite/run-tests (test_program): Use basename (fix copied
from src/nettle/examples/).
2002-09-12 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.5.0.
* misc/make-dist: Deleted obsolete make check-more call.
* src/keyexchange.c (kex_make_encrypt, kex_make_decrypt): Changed
interface so that we can both support the "none" cipher, and
return failure for weak keys.
(install_keys): Updated to the new kex_make_encrypt and
kex_make_decrypt interface.
* configure.ac: Deleted the ipv6 test that tried to create an ipv6
socket.
2002-09-03 Pontus Skld <pont@soua.net>
* src/server_x11.c (XAUTH_PROGRAM): Use predefined value if
available and built in default if not.
* configure.ac: Search for xauth.
2002-09-02 Pontus Skld <pont@soua.net>
* src/testsuite/lsh-8-test: New test. Check whatever unencrypted
sessions work.
2002-08-30 Pontus Skld <pont@soua.net>
* src/testsuite/functions.sh: Defaults need to be quoted if they
contain spaces.
2002-08-29 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/x11-1-test: Renamed, was lshd-x11-1-test.
* src/testsuite/functions.sh (test_fail, test_result): Call exit.
(test_skip): New function.
(check_x11_support): New function.
* src/testsuite/Makefile.am (distclean-local): Delete files and
directories created by the test cases.
(EXTRA_DIST): Distribute key-2.private and fake-sshd1.
* src/lsh.c (main_options, main_argp_parser): Handle X11 options
only if WITH_X11_FORWARD is defined.
2002-08-28 Niels Mller <nisse@cuckoo.hack.org>
* doc/lsh.texinfo (Top): Use @ififo around the @top directive, to
get rid of the empty menu item inthe html output.
* configure.ac: Bumped version to 1.5.
2002-08-28 Niels Mller <niels@s3.kth.se>
* doc/index.html: New file.
* src/lsh-authorize: Use the construction ": ${var:=default}".
* src/testsuite/functions.sh: New variables TEST_HOME and
SEXP_CONV. Changed the initialization of LSH_YARROW_SEED_FILE. Use
TEST_HOME when running lsh and lshd. Should make the tests
independent of our own ~/.lsh. Also updated comments in
test-scripts that said they were dependent on ~/.lsh.
Use the construction ": ${var:=default}".
* src/testsuite/setup-env: New script to set up a HOME-directory
for the tests.
* src/testsuite/lshd-x11-1-test: New test.
* src/lsh-authorize: Set SEXP_CONV to "sexp-conv", unless that
variable is already defined by the caller.
* src/server_x11.c (SUN_LEN): #define SUN_LEN if needed.
2002-08-27 Niels Mller <nisse@cuckoo.hack.org>
* src/server_x11.c (new_x11_channel): We don't have any ip-address
of the client, so send <"unix-domain", 0> as the peer address.
2002-08-27 Niels Mller <niels@s3.kth.se>
* src/server_pty.c (pty_open_slave): Removed call to setsid(),
moved to...
* src/unix_user.c (do_spawn): Call setsid(). Was previously done by
the pty code, and only in the pty case. Fixed also in 1.4 branch.
* src/server_session.c (init_spawn_info): Save the SSH_CLIENT
value in the session struct, so that it can be gc:ed properly.
* src/charset.c (low_utf8_to_local): Use lsh_string_trunc.
* src/digits.c (decode_base64): Likewise.
* src/io.c (do_consuming_read): Likewise.
* src/read_base64.c (do_read_base64): Likewise.
* src/read_file.c (do_read_file): Likewise.
* src/string_buffer.c (string_buffer_final_write): Likewise.
(string_buffer_final): Likewise.
* src/channel.c (channel_data_handler): Likewise.
(channel_extended_data_handler): Likewise.
* src/tty.c (tty_encode_term_mode): Likewise.
* src/abstract_crypto.c (crypt_string): Check that input is a
multiple of the block size.
(crypt_string_unpad): Use lsh_string_trunc.
* src/format.c (lsh_string_trunc): New function, needed to get
proper NUL-termination when strings are truncated.
* src/server_x11.c (do_xauth_exit): Fixed format strings for error
messages.
2002-08-27 Niels Mller <nisse@cuckoo.hack.org>
* src/server_x11.c (server_x11_setup): Bugfix, really call
server_x11_listen.
2002-08-26 Niels Mller <nisse@cuckoo.hack.org>
* src/server_x11.c (OPEN_FORWARDED_X11): Added forward
declaration.
(server_x11_callback): Renamed (was server_x11_forward), and
enabled.
(server_x11_socket): New attribute display_number.
(open_x11_socket): Pass an exception handler to io_bind_sockaddr.
Start listening on the socket. Record the display_number.
(server_x11_setup): Added argument single (and fail if it is
non-zero). Updated caller in server_session.c. Call
server_x11_setup. Ues the real display number when formatting the
DISPLAY string.
* src/channel_forward.c (catch_channel_open): Moved here...
* src/tcpforward_commands.c: ...from here.
* src/tcpforward_commands.c (tcpip_connect_io_command): Renamed,
was tcpip_connect_io.
(do_tcpip_start_io): Deleted, replaced by channel_forward_start_io.
* src/tcpforward.c: No need to include string.h and errno.h.
* src/tty.c: Likewise.
* src/server_userauth.c: No need to include string.h.
* src/randomness.c: No need to include errno.h.
* src/read_packet.c: Likewise.
* src/io_commands.h (make_listen_local, make_connect_local):
Deleted prototypes.
* src/werror.c (werror_vformat): Added %e specifier. Updated all
errno printing functions to use it.
(werror_format): New function.
(fatal): Compile time flag to display pid and hang, instead of
aborting. Useful for debugging.
2002-08-25 Niels Mller <nisse@cuckoo.hack.org>
* src/server_x11.c (new_x11_channel): New function.
(open_forwarded_x11): New command.
* src/lsh.c (main_argp_parser): Updated call of
make_gateway_setup.
* src/io_commands.c (bind_local_command): New command.
(do_listen_local): Deleted function.
(make_listen_local): Deleted function.
(do_connect_local): Deleted old #if:ed out function.
(make_connect_local): Deleted old #if:ed out function.
* src/gateway_commands.c (make_gateway_setup): Take a local_info
as argument. Use the new bind_local command.
* src/lsh.h: Added forward declarations for structs in command.h.
Removed the inclusion of command.h from other header files.
* src/channel_forward.c (start_io_command): New command, to
replace tcpip_start_io.
* src/lsh_proxy.c (lsh_proxy_listen): Replaced listen_callback
with new bind and listen commands.
2002-08-24 Niels Mller <nisse@cuckoo.hack.org>
* src/io_commands.c (do_listen): Deleted function.
(listen_with_callback): Deleted command.
* src/lshd.c (make_lshd_listen): Replaced listen_callback with new
bind and listen commands.
* src/io_commands.c (listen_command): New command, to replace
listen_with_callback.
(bind_address_command): New command.
* src/io.c (make_listen_callback): Use a command, not a
continuation, to represent the callback. Updated callers.
* src/io_commands.c (do_listen): Use io_bind_sockaddr.
(do_listen_local): Use io_bind_local.
* src/io.c (io_bind_sockaddr): New function.
(io_listen_fd): Take a struct lsh_fd * as argument, instead of an
int.
(io_listen): Use io_bind_sockaddr.
(io_listen, io_listen_fd): Deleted function io_listen. Renamed
io_listen_fd to io_listen.
(io_bind_local): New function replacing io_listen_local. Updated
callers.
2002-08-11 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c (do_read_file): Use seteuid, not setuid.
* src/server_x11.c (server_x11_socket): New class.
(delete_x11_socket): New function.
(do_kill_x11_socket): New function.
(open_x11_socket): New function.
(server_x11_listen): New function.
* src/lshd.c: Enable X11 support.
* src/server_session.c: Likewise.
* src/io.c (io_listen_fd): New function.
(io_listen): Use io_listen_fd.
(lsh_popd): Renamed safe_popd, and made non-static.
(lsh_pushd_fd): New function.
(lsh_pushd): Renamed safe_pushd, and use lsh_pushd_fd. Also added
arguments result and secret. Updated all callers.
2002-07-18 Niels Mller <niels@s3.kth.se>
* configure.ac: Use -ggdb3 for gcc, except for gcc-2.96.
2002-07-05 Niels Mller <nisse@cuckoo.hack.org>
* src/lshd.c: Disabled incomplete x11 forwarding for now.
* src/server_session.c: Likewise.
* src/server_x11.c: Likewise.
2002-07-03 Pontus Skld <pont@soua.net>
* src/lshg.c: Include <unistd.h> to get execvp declaration, define
LSH_FILENAME if not defined.
(lshg_options): New attribute fallback_lsh.
(make_options): Initialize fallback_lsh.
(main_options): New option -G to handle fallback.
(main_argp_parser): Handle new option.
(main_argp): Added missing space in message.
(lshg_exception_handler): New class.
(do_exc_lshg_handler): If the exception was because there was no
usable gateway and fallback is enabled, launch lsh instead.
(make_lshg_exception_handler): No longer call
make_exception_handler but construct the object ourself.
(main): make_lshg_exception_handler takes more arguments to handle
the lsh fallback.
* src/io_commands.c (connect_local_command): Check if the
connection was successfull and raise an exception otherwise.
2002-07-02 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c (do_spawn): Allow err[1] and out[1] to be the
same fd.
* src/server_x11.c (do_xauth_exit): Log a message if xauth failed.
(server_x11_setup): Fixed format of display string.
(server_x11_setup): Use an absolute filename for the xauth program.
(server_x11_setup): Added missing new line on the xauth command
line.
* src/server_session.c (init_spawn_info): Set DISPLAY and
XAUTHORITY, if x11 forwarding was requested. Updated callers, as
the size of env changed.
(do_x11_req): Bugfix, the single flag is one byte, not four.
* src/Makefile.am.in (liblsh_a_SOURCES): Added server_x11.c.
2002-06-28 Niels Mller <niels@s3.kth.se>
* src/lshd.c (main_options): New options, --tcpip-forward,
--no-tcpip-forward (earlier there was no option for disabling
tcpip forward), --x11-forward and --no-x11-forward.
(main_argp_parser): Handle x11 options.
(main): Install handler for x11-req, if appropriate.
* src/server_session.h (x11_req_handler): Declare handler.
* src/server_session.c (do_x11_req): Fixed error message.
2002-06-27 Niels Mller <niels@s3.kth.se>
* src/lsh_proxy.c (main) [WITH_X11_FORWARD]: Fixed type warning.
* src/lsh.c (main_argp_parser): Use STATIC_REPORT_EXCEPTION_INFO,
and const.
* src/lshd.c (main): Likewise.
* configure.ac: Fixed type, enable_x11_forward should work now.
* src/server_x11.c (server_x11_setup): Bugfixes. Send cookie on
xauth stdin.
* src/tcpforward_commands.c (open_tcpip_report): Declare const.:
* src/server_session.c (do_x11_req): Use server_x11_setup.
* src/channel.c (channel_request_handler): Use a const
report_exception_info.
(global_request_handler): Likewise.
* src/exception.c (make_report_exception_handler): Use a const
report_exception_info object.
* src/command.c (make_catch_report_apply): Likewise.
2002-06-27 Pontus Skld <pont@soua.net>
* src/testsuite/string-test.c (test_main): Added extra bubble
babble check for a typo Richard Kettlewell discovered.
2002-06-26 Pontus Skld <pont@soua.net>
* src/format.c (lsh_string_bubblebabble): Fixed stupid typo making
w occur in bubble babble fingerprint where it should be z. Also
fixed the size of the cons array.
2002-06-26 Niels Mller <niels@s3.kth.se>
* src/unix_user.c (do_lookup_user): Don't treat accounts with a
single "*" in the paswd-field as disabled.
* src/spki.c (spki_pkcs5_decrypt): Bug fixes. Friendlier pass
phrase prompt.
* src/unix_user.c (do_verify_password): Interpret short
passwd-fields as password login disabled.
(do_lookup_user): Improved rules for dealing with shadow
passwords, disabled accounts, etc.
* src/io.c (do_write_callback): Added some code to ignore write
errors for the final , but #if:ed out the code again.
* src/client_userauth.c (do_none_login): Print a verbose message.
(send_password): Likewise.
(do_userauth_pk_ok): Likewise.
(do_publickey_login): Likewise.
* src/client_session.c (do_client_io): Updated invocations of
make_channel_io_exception_handler.
* src/server_session.c (spawn_process): Create a silent exception
handler for i/o errors on stdout, to avoid cluttering down the
log.
* src/channel.c (make_channel_io_exception_handler): New argument
silent.
* configure.ac: Bumped version to 1.4.2.
* src/lsh.c (read_user_keys): Support aes for encrypted private
keys.
2002-06-26 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-make-seed.c (get_dev_random): Bugfix: Actually try both
/dev/random and /dev/urandom.
* doc/lsh.texinfo (lshd basics): Changed invokation of lsh-keygen.
2002-06-25 Niels Mller <niels@s3.kth.se>
* src/server_x11.c, src/server_x11.h: New files.
(make_xauth_exit_callback): New function.
(server_x11_setup): New function.
* src/server_session.c (server_session): New attribute x11.
(do_x11_req): New function.
2002-06-23 Pontus Skld <pont@soua.net>
* configure.ac: Cosmetic changes of message shown when libwrap
detection fails.
2002-06-18 Niels Mller <nisse@cuckoo.hack.org>
* src/server_session.c (spawn_process): Call io_set_type, if stdin
is a pty.
(do_eof): Removed the pty ^D hack,a s it's now taken care of by
close_fd_write.
2002-06-17 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (io_set_type): New function.
(close_fd_nicely): Call close_fd_write, for handling the
write-related work.
(close_fd_write): If the fd is a pty, write a EOF (^D) character.
* src/io.h (lsh_fd): New attribute TYPE.
2002-06-05 Niels Mller <nisse@cuckoo.hack.org>
* configure.ac: Bumped version to 1.4.1. New option
--enable-initgroups-workaround, copied from the 1.2 branch.
2002-06-04 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.4.
* src/rsa.c (do_rsa_public_spki_key): Reverted the 2001-01-24
change "rsa-pkcs1-sha1" -> "rsa-pkcs1".
* src/testsuite/conv-2-test, src/testsuite/conv-3-test: Updated
testcases.
2002-05-30 Pontus Skld <pont@soua.net>
* src/server_session.c (init_spawn_info): Require more entries
available for environment variables. Set SSH_TTY if appropiate as
well as SSH_CLIENT.
(shell_request_handler): Reserve more environment variable
entries.
(exec_request_handler): Dito.
(do_spawn_subsystem): Dito.
* src/io_commands.c (do_connect_continuation): Derive local
address_info from fd and pass to make_listen_value.
* src/io.c (make_listen_value): Takes an extra struct
address_info* to initialize local with.
(do_listen_callback): Get a local address_info and pass to
make_listen_value.
(fd2info): New function.
* src/io.h: New variable local in listen_value. make_listen_value
takes an extra struct address_info*.
(fd2info): declaration of new function.
* src/gateway_commands.c (gateway_make_connection): Also pass
lv->local to make_ssh_connection.
* src/handshake.c (handshake_command): dito.
* src/connection.h: New variable local in ssh_connection.
make_ssh_connection takes an extra struct address_info*.
* src/connection.c (make_ssh_connection): dito.
2002-05-24 Pontus Skld <pont@soua.net>
* src/io.c (io_final): Set stdin, stdout and stderr to blocking mode.
* src/io_commands.c (do_tcp_wrapper): Send a copy of self->msg to
A_WRITE instead of the string itself.
2002-05-15 Pontus Skld <pont@soua.net>
* configure.ac: Added things neccessarry for tcp wrappers to work.
* src/lshd.c (OPTIONS2TCP_WRAPPER): New command.
New options: --tcpwrappers, --no-tcpwrappers, --tcpwrappers-msg.
* src/io_commands.c: Include <tcpd.h> if building with tcp
wrappers. Also include <syslog.h>.
(tcp_wrapper): New class.
(do_tcp_wrapper): New function.
(do_tcp_wrapper): New function.
* src/io_commands.h (make_tcp_wrapper): Definition of new
function.
2002-05-14 Pontus Skld <pont@soua.net>
* src/algorithms.c (list_algorithms): Added missing newline after
the list of algorithms.
(list_hostkey_algorithms): dito.
2002-05-13 Pontus Skld <pont@soua.net>
* src/lsh.c (make_options): Don't fail totally if we can't create
a randomness source.
(main_argp_parser): Do argp_failure unless we have a valid
randomness object.
* src/lshd.c (main): Check for a correctly initialized random
object in options.
(make_lshd_options): Don't return failure if random creation
failed, just initialize signature_algorithms with a null random
source (this should enable users without a seed to do lsh --help
and normal users to do lshd --help).
(main_argp_parser): Do argp_failure unless we have a valid
randomness object.
2002-05-06 Niels Mller <nisse@cuckoo.hack.org>
* README: Document requirement of autoconf-2.52 and
automake-1.6.1.
* configure.ac: Require autoconf-2.52.
2002-05-06 Niels Mller <niels@s3.kth.se>
* configure.ac (CFLAGS): Don't enable -Waggregate-return.
2002-05-06 Niels Mller <nisse@cuckoo.hack.org>
* src/gateway_channel.c (do_gateway_channel_open): Undid previous
change. Let channel.c:check_rec_max_packet adjust the
rec_max_packet size if needed, when it gets to the channel.
(do_gateway_channel_open_continuation): Likewise.
* src/channel.c (check_rec_max_packet): New function, that adjusts
our advertised rec_window_size so that we won't exceed the
connection's packet size limit.
(format_open_confirmation): Call check_rec_max_packet.
(format_channel_open_s): Likewise.
(format_channel_open): Likewise.
* src/read_data.c (do_read_data_query): Undid previous change. Now
look at only send_window_size and send_max_packet.
2002-05-05 Niels Mller <nisse@lysator.liu.se>
* configure.ac: Pass no options to AM_INIT_AUTOMAKE.
2002-05-05 Niels Mller <nisse@cuckoo.hack.org>
* configure.ac: Update for automake-1.6.
* src/gateway_channel.c (do_channel_open_forward): Added a FIXME
comment. We should install a new exception handler here.
* configure.ac: Renamed file, used to be configure.in.
* configure.in: Bumped version number to 1.4.
* doc/lsh.texinfo (Algorithm options): Updated description of the
default cipher. We now use AES, not triple-DES.
2002-05-02 Niels Mller <nisse@cuckoo.hack.org>
* src/gateway_channel.c (do_gateway_channel_open): Limit
rec_max_packet to SSH_MAX_PACKET.
(do_gateway_channel_open_continuation): Likewise.
* src/channel.c (parse_channel_open): Don't subtract
SSH_MAX_PACKET_FUZZ here, it's handled in read_data.c.
* src/server_session.c (make_server_session): Likewise.
* src/client_session.c (make_client_session_channel): Likewise.
* src/channel_forward.c (init_channel_forward): Likewise.
* src/read_data.c (do_read_data_query): Don't read more than
send_max_packet - SSH_MAX_PACKET_FUZZ, as to not exceed the
receivers maximum packet size.
2002-04-04 Pontus Skld <pont@soua.net>
* src/lsh.c (do_lsh_lookup): Cosmetic changes of unauthenticated
key fingerprint text.
2002-04-03 Pontus Skld <pont@soua.net>
* src/format.c (lsh_string_bubblebabble_c): New function to define
the che bubble babble checksum series, used by
lsh_string_bubblebabble.
* src/lsh.c (do_lsh_lookup): Rearranged the unauthenticated key
fingerprint display somewhat and added bubble babble SHA1 of
keyblob (which seems to be what OpenSSH is using at least).
* src/format.c (lsh_string_bubblebabble): New function to
bubblebabble a string.
* src/format.h (lsh_string_bubblebabble): New function to
bubblebabble a string.
* src/testsuite/string-test.c (test_main): Added checks for
lsh_string_bubblebabble.
* src/lsh.c (do_lsh_lookup): Output the fingerprint of the remote
host according to draft-ietf-secsh-fingerprint-00.txt (and keep
the old way of outputing).
* src/format.c (lsh_string_colonize): New function to insert
colons in a lsh_string.
* src/format.h (lsh_string_colonize): Likewise
* src/testsuite/string-test.c (test_main): Added tests for
lsh_string_colonize.
* src/client.c (client_options): Bugfix: OPT_SUBSYSTEM shouldn't
be inside char quotes.
2002-03-27 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (lsh_oop_stop_callback): Use the OOP_HALT constant.
* src/client_x11.c (do_client_channel_x11_receive): Allow
lowercase letters 'l' and 'b' for the endianness indicator.
* src/client.c: Removed the short alias, -C, for the --subsystem
option.
2002-03-26 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-authorize: Don't use &>-redirects, as /bin/sh doesn't
understand that. Noticed by Timshell Knoll.
2002-03-25 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-execuv.c: Deleted utmp stuff, this is not the right
place for that.
2002-03-26 Pontus Skld <pont@soua.net>
* configure.in: If with_scheme is absolute, don't AC_PATH_PROG for
it but just use it directly.
* src/client.c (client_options): Added implication of no-pty in
subsystem help text if PTY-support is enabled.
(client_argp_parser): Turn of pty-request if there is a subsystem
request.
2002-03-22 Niels Mller <nisse@cuckoo.hack.org>
* src/sexp-conv.c (main): Add newline at end of --raw-hash output.
2002-03-20 Pontus Skld <pont@r3>
* src/testsuite/lsh-1-test: Run "exec 0" instead of "exec" in case
the last command in the user's startup files ended with nonzero
exit status.
* src/testsuite/lsh-5-test: Likewise.
* src/testsuite/lsh-6-test: Likewise.
* src/testsuite/lshg-1-test: grep -q changed to redirection to
/dev/null.
* src/testsuite/ssh1-fallback-test: Likewise.
2002-03-20 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/run-tests (test_program): Added missing single
quote.
2002-03-20 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/functions.sh (at_connect): Put -- between the
options and the arguments, as that is the correct place according
to POSIX.
* src/testsuite/lsh-7-test: Rewrote !command-expressions as an if
expression, to work with /bin/sh.
2002-03-20 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (address_info2sockaddr): Zero-terminate the
default_preferences list.
2002-03-20 Niels Mller <nisse@lysator.liu.se>
* src/client_session.c (make_client_session_channel): Clear the
CHANNEL_CLOSE_AT_EOF flag.
* src/testsuite/run-tests (test_program): Test the exit status of
the right process.
* src/testsuite/fail-test: New, always failing, testcase. For
testing run-tests.
* src/testsuite/functions.sh (at_connect): Don't use -- in
argument list to mini-inetd, appearantly Solaris' getopt
doesn't handle that.
2002-03-19 Niels Mller <nisse@lysator.liu.se>
* src/io.c (address_info2sockaddr): Prefer AF_INET addresses over
AF_INET6 (as it seems common that localhost has an ipv6 address
that doesn't work). Even better would be to try all addresses, but
that has to wait for later.
2002-03-19 Pontus Skld <pont@docs.uu.se>
* src/sftp/testsuite/*-test: grep -q is XPG4, which not all
greps (notably Solaris /bin/grep) are.
* src/sftp/testsuite/run-tests: Replaced bashims.
2002-03-19 Pontus Skld <pont@it.uu.se>
* src/testsuite/seed-test: Fixed bashism.
2002-03-19 Pontus Skld <pont@it.uu.se>
* src/testsuite/run-tests: Replaced bashims.
2002-03-19 Pontus Skld <pont@it.uu.se>
* src/unix_process.c: Added GETUTXID and UPDWTMPX.
(do_utmp_cleanup): Write cleared entry to wtmp{,x} with
updwtmp{,x} if logwtmp is not available.
(utmp_book_keeping): Likewise.
2002-03-18 Niels Mller <nisse@lysator.liu.se>
* src/lsh-pam-checkpw.c: Include stdlib.h.
2002-03-18 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/conv-3-test: New test program.
* contrib/lshd.debian.init: Check for existance of
/var/spool/lsh/yarrow-seed-file.
(restart): New target, which sends SIGHUP to the running lshd and
then starts a new one.
* src/testsuite/runtests: Old testscript removed.
* src/testsuite/Makefile.am (check-some, check-more): Use
run-tests, not runtests.
* src/io.c (io_run): Check for OOP_ERROR. This means we need at
least liboop-0.8.
* src/server_userauth.c (do_handle_userauth): Free username on
failure.
* src/server_publickey.c (do_authenticate): Free username and
keyblob on failure.
* src/lshd.c (lshd_options): New field resources, that keeps track
of resources to be killed at sighup or program exit.
(make_lshd_options): Create the resource list, and register it
with the gc.
(pid_file_resource): New class.
(sighup_close_callback): New class.
(do_sighup_close_callback): New SIGHUP handler.
(make_sighup_close_callback): New function.
(close_on_sighup): New command.
(make_lshd_listen): Close listen socket on SIGHUP.
(do_terminate_callback): Always catch SIGTERM.
(install_signal_handlers): Renamed the function
install_terminate_handler. Now installs handlers for both SIGHUP
and SIGTERM.
(main): Arrange for the pidfile to be deleted at exit or SIGHUP.
* src/io.c (nfiles): New global variable.
(lsh_oop_stop_callback): New function.
(lsh_oop_stop): New function.
(lsh_oop_cancel_stop): New function.
(io_nfiles): New function.
(close_fd): Decrement nfiles, and call lsh_oop_stop when no files
are left.
(make_lsh_fd): Increment nfiles.
* src/format.c (ssh_format): Use the format string as the
debugging "clue" for the string.
* configure.in (CFLAGS): Don't use -ggdb3, as it seems to be
broken on sparc.
* src/unix_process.c: Unified utmp/utmpx code.
2002-03-18 Pontus Skld <pont@it.uu.se>
* src/unix_process.c: Make certain WTMP_FILE and WTMPX_FILE are
defined.
* configure.in: Can't check for structs with AC_CHECK_MEMBER,
check for a sub member instead.
* src/unix_process.c (do_utmp_cleanup): Rewrote to use utmpx if
both utmpx and utmp is available. Also, don't search for an
existing entry but construct a new one and putut{,x}line it.
Don't clear fields explicitly (the memset).
(utmp_book_keeping): Prefer utmpx, and don't search for existing
entries.
Bugfix: gettimeofday takes two arguments, pass 0 as second (timezone).
2002-03-18 Pontus Skld <pont@it.uu.se>
* configure.in: Check for utmpx symmetrically to utmp. Check for
more members of struct utmp. Check for members of struct utmpx.
2002-03-18 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-keygen.c (main): Updated to use the rewritten
rsa_generate_key.
2002-03-17 Niels Mller <nisse@cuckoo.hack.org>
* src/rsa_keygen.c (rsa_generate_key): Rewrote to use nettle's RSA
key generation. Deleted the argument E.
* src/lsh-writekey.c (main_argp_parser): Initialize a randomness
generator only if needed (i.e. if the key is going to be
encrypted), and let the --server determine which seed-file is
used.
* src/lsh-writekey.c (main): New option --server, that writes the
output files where the server expects its host key.
* src/lsh-writekey.c (main): Check that files doesn't exist before
reading the key, but don't create the files until they are
actually written to.
(file_exists): New fucntion.
(check_file): New function.
(open_file): New function.
(open_private_file): Deleted function.
(open_public_file): Deleted function.
* src/lsh-keygen.c (do_lsh_keygen_handler): Deleted obsolete
function.
* src/lsh-keygen.c (main): New option --server, that uses the
server's seed-file.
* src/unix_user.c (safe_close): New function.
(do_spawn): Avoid close(-1).
2002-03-17 Pontus <pont@it.uu.se>
* src/unix_process.c (do_utmp_cleanup): Set ut_type to
USER_PROCESS before calling getutid (neccessary on my Linux
system, and shouldn't break anything). Make a working copy to
modify. Do some logging.
2002-03-16 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c (exec_shell): Bugfix, fixed test for login-mode.
* src/unix_process.c (do_utmp_cleanup): Compute suitable values
for ut_line and ut_id.
(strip_tty_name): Deleted function.
(do_utmp_cleanup): Modify utmp by setutmp, getutid, pututline.
(utmp_book_keeping): Likewise.
* configure.in (SCHEME_NAME): Simple check for gmp.h, don't look
for gmp2/gmp.h.
Check for ut_time, ut_tv, ut_pid and ut_exit memebers in struct
utmp.
Check for __gmpz_getlimbn, introduced in gmp-3.1. Dropped support
for gmp2 (as Nettle doesn't support it anyway).
* src/unix_user.c (do_chdir_home): Deleted function.
(change_uid): Deleted function.
* src/unix_process.c (unix_process_setup): Removed login argument
again.
(utmp_book_keeping): Always create utmp entries as USER_PROCESS,
not LOGIN_PROCESS.
* src/unix_user.c (do_fork_process): Deleted function.
(do_exec_shell): Deleted function.
* src/userauth.h (USER_CHDIR_HOME): Deleted method.
(USER_FORK): Deleted method.
(USER_EXEC): Deleted method.
* src/unix_user.c (make_process_resource): Deleted old code.
* src/server_session.c (spawn_process): Deleted old code.
(shell_request_handler): Likewise.
(exec_request_handler): Likewise.
(do_spawn_subsystem): Likewise.
* src/server_session.c (format_exit_signal): Removed "Process
killed by" from the message.
(spawn_process): Rewrote function, using USER_SPAWN and struct
spawn_info. Updated the shell_request, exec_request and
subsystem_request handlers.
(init_spawn_info): New function.
(do_spawn_subsystem): Fixed argument list, should be -c <program>.
* src/unix_user.c (exec_shell): Added the real login shell to the
lsh-execuv argument list.
(do_spawn): Bug fix, don't reference info->pty->tty_name if
info->pty is NULL.
(make_unix_user): Initialize the spawn pointer.
* src/unix_process.c: Added some trace calls.
2002-03-15 Niels Mller <nisse@cuckoo.hack.org>
* src/userauth.h (struct spawn_info): Struct with information for
the new USER_SPAWN method.
(USER_SPAWN): New method.
* src/unix_user.c (chdir_home): New function.
(exec_shell): New function.
(do_spawn): New function.
#if:ed out code that has been moved to unix_process.c.
(do_lookup_user): Use /bin/sh as login shell if there's no login
shell in the passwd-database.
* src/unix_process.c (unix_process_setup): Adding login argument,
which should be non-zero for a login session.
* src/reaper.h (reap): Deleted this super class. Updated users.
* src/Makefile.am.in (liblsh_a_SOURCES): Added unix_process.c.
(lsh_execuv_LDADD): lsh-execuv need not be linked with liblsh.
* configure.in: Check for more utmp related functions.
2002-03-14 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_process.c: New file, to replace the process stuff in
unix_user.c
2002-03-14 Pontus <pont@it.uu.se>
* configure.in: Added check for libpam if PAM is enabled.
2002-03-14 Niels Mller <nisse@cuckoo.hack.org>
* src/resource.h (REMEMBER_RESOURCE): Deleted method, use an
ordinary fucntion remember_resource instead. Updated all callers.
* src/resource.c (concrete_resource_list): Deleted class, put all
information directly in the resource_lsit class.
(remember_resource): New public function.
* configure.in: Removed check for 8-bit clean m4.
* src/channel.c (do_channels_after_keyexchange): New function.
(init_connection_service): Call connection_after_keyexchange, to
start reading again after a key exchange.
* src/gateway_channel.c (do_send_adjust): Call FLOW_CONTROL_REPORT
only if i > 0.
* src/handshake.c (handshake_command): Call
connection_after_keyexchange.
* src/connection.h (ssh_connection): Renamed established attribute
to keyexchange_done.
* src/connection.c (make_ssh_connection): Deleted the continuation
argument.
(connection_after_keyexchange): New function.
* src/read_data.c (do_read_data_query): Check the connection's
send_kex_only flag.
* src/keyexchange.c (keyexchange_finish): Moved invocation of
connection->established...
* src/connection.c (connection_send_kex_end): ...to here.
* src/resource.c (do_remember_resource): Assert that resource is
non-NULL.
* src/keyexchange.c (send_kexinit): Create a new kexinit struct.
Disable key-expire timer during the key exchange.
(make_kexinit_handler): Deleted init argument, it's now stored
with the connection.
(SESSION_KEY_LIFETIME_CLIENT, SESSION_KEY_LIFETIME_SERVER): New
constants.
(do_handle_newkeys): Install key expire timeout.
(set_reexchange_timeout): New function.
* src/io.c (lsh_oop_register_callout, lsh_oop_cancel_callout):
Added trace call.
* src/handshake.c (handshake_command): Store the make_kexinit
object in the connection's kexinit attribute.
* src/connection.h (ssh_connection): New attribute kexinit, needed
for initiating keyexchange.
* src/algorithms.c (all_crypto_algorithms): Prefer aes256.
(default_crypto_algorithms): Likewise.
* src/Makefile.am.in (EXTRA_PROGRAMS): Added lsh-pam-checkpw.
2002-03-13 Niels Mller <nisse@cuckoo.hack.org>
* src/keyexchange.c (send_kexinit): Renamed from
initiate_keyexchange. Updated callers. Disable the key re-exchange
timer.
(do_handle_kexinit): Call send_kexinit, instead of duplicating
it.
* src/testsuite/Makefile.am (TS_PROGS): Added parse-config-test.
* src/string_buffer.c (string_buffer_putc): New constant
BUFFER_INCREMENT. Code still not used.
* src/ssh.h (SSH_FIRST_KEYEXCHANGE_SPECIFIC): New constant.
* src/parse_config.c (parse_setting): Return a status code, to get
the handling of ignored keywords right. Updated callers.
(parse_hosts): Return a status code. Updated callers.
* src/lshg.c (do_lshg_send_ignore): Use C_WRITE_NOW.
* src/keyexchange.c (initiate_keyexchange): Call
connection_send_kex_start. Use C_WRITE_NOW.
(do_handle_kexinit): Likewise.
(do_handle_newkeys): For uniformity, reset the NEWKEYS handler to
&connection_fail_handler, even though NULL should work fine.
(keyexchange_finish): Use C_WRITE_NOW. Call
connection_send_kex_end. #if:ed out the code sending DEBUG
messages at this point.
* src/handshake.c (compat_info): SSH-3.0 still needs the
PEER_SEND_NO_DEBUG flag. Also updated code to use the the
peer_flag enum.
* src/client_keyexchange.c (do_init_client_dh): Use C_WRITE_NOW.
(do_handle_srp_reply): Likewise.
(do_init_client_srp): Likewise.
* src/server_keyexchange.c (do_handle_dh_init): Likewise.
(do_srp_server_proof_handler): Likewise.
(do_server_srp_read_verifier): Likewise.
* src/config_parse.y: Deleted file, use a recursive-descent parser
instead.
* src/Makefile.am.in (liblsh_a_SOURCES): Added parse_config.c.
Removed disconnect.c
* src/disconnect.c, src/disconnect.h: Deleted files, code moved to
connection.c.
* src/debug.c (send_debug_message): Use C_WRITE_NOW.
(send_debug, send_verbose): #if:ed out fucntions.
* src/connection.h (enum connection_flag, enum peer_flag, enum
kex_state): New enum types.
(C_WRITE_NOW): New macro.
* src/connection.c (connection_handle_packet): Don't allow random
messages during key exchange.
(connection_disconnect_handler, format_disconnect): Moved code
from disconnect.c.
(connection_send): New function, queueing messages during key
exchange.
(connection_send_kex_start): New function.
(connection_send_kex_end): New function.
2002-03-11 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/testutils.h: Include werror.h.
* src/testsuite/parse-config-test.c: New file.
* src/parse_config.c: Work in progress. Added linenumber handling
and comments.
2002-03-05 Niels Mller <nisse@cuckoo.hack.org>
Cleaned up the bug compatibility tests.
* src/handshake.c (compat_peer_flags): New function.
(do_line): Call compat_peer_flags.
* src/abstract_crypto.c (hash_string): Declare the input string as
const.
(mac_string): Likewise.
* src/testsuite/testutils.c (test_hash): New function.
(test_mac): New function.
(test_sign): New function.
(do_bad_random): New function, stupid randomness source for the
test programs to use.
(test_spki_match, test_spki_grant, test_spki_deny): New functions.
* src/testsuite/run-tests: Improved testscript, copied from
nettle/testsuite.
* src/testsuite/testutils.c: Utility functions used by test
programs.
Don't use m4 to generate test programs. Added C files to CVS,
deleted m4 files.
* src/testsuite/Makefile.am: Deleted m4 files and rules.
2002-03-04 Niels Mller <nisse@cuckoo.hack.org>
* src/parse_config.c, src/parse_config.h: New files. A lexer and a
recursive-descent parser for config files.
2002-02-27 Niels Mller <nisse@cuckoo.hack.org>
* src/config_parse.y: New file, for parsing config files.
* src/unix_interact.c (do_make_raw): Modify the terminal's VMIN
and VTIME values.
* src/io.c (io_callout): Added an argument, the number of seconds
until the callout should be invoked.
* src/handshake.c (handshake_command): Make the connection timeout
if handshake is not completed within 10 minutes.
* src/gc.c (gc_register): Updated call of io_callout.
* src/connection.c (connection_set_timeout): New function.
(connection_clear_timeout): New function.
* src/channel.c (init_connection_service): Cancel the connection's
timeout timer.
2002-02-22 Niels Mller <nisse@cuckoo.hack.org>
* src/client.c (init_client_options): Initialize port to NULL, in
order to get the fallback from "ssh" -> 22 to work. FIXED in 1.2
branch.
(client_argp_parser): Fixed port error message not to try printing
NULL. FIXED in 1.2 branch.
2002-02-21 Niels Mller <nisse@cuckoo.hack.org>
* src/server_session.c (make_pty): Simple bugfix, pty->master was
lost too early.
(spawn_process): Use an extra pipe for syncronization. The parent
process won't proceed until the child is finished with it's pty
processing. This works around a Solaris problem where reading the
master side of the pty before the slave has been opened results in
EINVAL.
(do_alloc_pty): Bugfix, record the new pty properly.
2002-02-19 Niels Mller <nisse@cuckoo.hack.org>
* src/server_session.c (spawn_process): Let the child process open
the slave side of the pty.
(do_alloc_pty): Don't open or touch the slave side of the pty,
just open the master side and store the mode of the client,a nd
the window dimensions, in the pty_info struct for use later.
* src/server_pty.c (do_kill_pty_info): Don't touch slave tty (as
it's not opened yet).
(pty_open_master): Renamed the pty_allocate function. Now opens
only the master pty. Opening the slave as well has too many side
effects, in particular, pushing the pty-related STREAMS modules
on Solaris have the side effect of making the pty the controlling
process of the lshd server (if it's running in daemonic mode).
(pty_open_slave): Renamed function tty_setctty. Now responsible
also for opening the slave side of the pty, pushing STREAMS
modules, and setting the tty state.
* src/server_pty.h: Include tty.h.
(pty_info)): Deleted slave attribute. Added attributes dims and
mode.
* configure.in (CPPFLAGS): Don't zap old value.
* src/crypto.c (make_aes_cbc_instance): Use aes_set_encrypt_key
and aes_set_decrypt_key. aes_set_key is obsolete.
2002-02-07 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/.bootstrap: Added -a flag to automake invocation.
* src/sftp/sftp_c.c: Constness fixes.
* src/sftp/sftp_bind.c (lsftp_open_connection): Bugfix, don't use
i and i++ in the same expression.
(lsftp_wait_not_eof): #if:ed out, not used anywhere.
(lsftp_remove_sftp_cb): Likewise.
Constness fixes, changed calling conventions not to pass and
return structs.
* src/sftp/lsftp.c (lsftp_num_commands): Declared function static.
(lsftp_interactive_mainloop): Likewise.
(lsftp_noninteractive_mainloop): Likewise.
* src/sftp/dc.c (lsftp_dc_free_index): Made function static.
(lsftp_dc_make_index): Likewise.
(lsftp_dc_r_sloppy_glob): Likewise.
(lsftp_dc_path_no_glob): Likewise.
(lsftp_dc_path_first_glob): Likewise.
General constification.
* src/sftp/commands.c: Constification. Fixed warnings for mising
prototypes and unused arguments.
* src/sftp/commands.h (command_func): New typedef.
* src/sftp/rl.c, src/sftp/rl.h: Fixed prototypes for funtions
taking no arguments.
* src/sftp/misc_fun.c (mgetenv): Fixed "valren" typo.
(lsftp_skip_common): Use const char * for arguments and return
value.
(filename_part): Likewise.
* src/sftp/str_utils.c (lsftp_unqoute): #if:ed out, this function
isn't used anywhere.
Constified, now uses const char * for most strings.
* src/sftp/sftp_c.h (struct sftp_mem): Use UINT32, instead of
signed int.
(sftp_callback_func): New typedef.
(struct sftp_callback): Changed prototype for nextfun. Changed
UINT64 to off_t.
Changed all prototypes to not pass and return structs without
using pointers.
* src/sftp/sftp_c.c: General change of calling conventions. Pass
struct * and const struct *, instead of passing and returning
structures "by-value".
* src/sftp/buffer.c (sftp_packet_size): New function.
(sftp_read_packet): Call clearerr after checking for error and
eof.
2002-02-06 Niels Mller <nisse@cuckoo.hack.org>
Checked in Pontus Skld's lsftp client.
* src/sftp/Makefile.am (lsftp_SOURCES): New make variable.
* src/sftp/commands.c: New file.
* src/sftp/commands.h: New file.
* src/sftp/dc.c: New file.
* src/sftp/dc.h: New file.
* src/sftp/lsftp.c: New file.
* src/sftp/lsftp.h: New file.
* src/sftp/misc_fun.c: New file.
* src/sftp/misc_fun.h: New file.
* src/sftp/rl.c: New file.
* src/sftp/rl.h: New file.
* src/sftp/sftp_bind.c: New file.
* src/sftp/sftp_bind.h: New file.
* src/sftp/sftp_c.c: New file.
* src/sftp/sftp_c.h: New file.
* src/sftp/str_utils.c: New file.
* src/sftp/str_utils.h: New file.
2002-02-01 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/sftp-test-client.c: Deleted old code.
(sftp_client_get_status): New function, for parsing -02 draft
status messages. Use it everywhere.
Applied Pontus Skld's patch to comply with the -02 draft.
* src/sftp/sftp-server.c (sftp_send_status): Added human-readable
message and language tag.
(sftp_process_mkdir): Get file attributes from the message, and
honor permission bits, if available.
(sftp_process_readlink): New function.
(sftp_process_symlink): New function.
(main): Added sftp_process_readlink and sftp_process_symlink to
the dispatch table.
* src/sftp/sftp.h (SSH_FXP_READLINK, SSH_FXP_SYMLINK): New message
types.
2002-01-31 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-pam-checkpw.c: Cosmetic changes.
* src/Makefile.am.in (sbin_PROGRAMS): Added @PAM_PROGRAM@.
* configure.in: PAM configuration. Command line option
--disable-pam, check for security/pam_appl.h, substitution of
PAM_PROGRAM.
2002-01-31 Niels Mller <nisse@lysator.liu.se>
* src/lsh-writekey.c (open_public_file): Fixed error message.
2002-01-24 Niels Mller <nisse@cuckoo.hack.org>
* src/sexp.c (sexp_format): Add a newline at the end of
expressions in transport syntax.
* src/sexp-conv.c (process_replace): New function.
(parse_replace): New function.
(main_options): New option --replace.
(main_argp_parser): Handle OPT_REPLACE.
(main): Call io_init and io_final. Needed to get the callback
registered by the gc to work.
(main): Call process_replace.
(main): Don't add trailing newlines; let sexp_format do that.
* src/io.c: Added assert checking that source is non-NULL, in
functions that need it.
* src/gc.c (gc): Print a verbose message at the start of gc.
2002-01-22 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_interact.c (do_make_raw): Added FIXME: about tty TIME
and VMIN settings.
* src/scm/gaba.scm (make-class): Added FIXME:-comment about
offsetof.
2002-01-21 Niels Mller <nisse@cuckoo.hack.org>
* src/xalloc.h (NEW_VAR_OBJECT, CLONE_VAR_OBJECT,
CLONED_VAR_OBJECT): New macros.
* src/xalloc.c (lsh_var_alloc): New function.
(lsh_object_alloc): Use lsh_var_alloc.
(lsh_var_clone): New function.
(lsh_object_clone): Use lsh_var_clone.
* src/list.c (lsh_list_alloc): Moved function here, from xalloc.c.
Now uses lsh_var_alloc.
2002-01-20 Niels Mller <nisse@cuckoo.hack.org>
* src/crypto.c (hash_update, hash_digest, hash_copy, make_hash):
New functions using struct nettle_hash.
(make_hmac_algorithm): Reorganized hmac implementation again. Now
uses struct nettle_hash.
Updated all users.
* src/algorithms.c (all_symmetric_algorithms): Changed back to use
make_hmac_algorithm.
* src/abstract_crypto.h (hash_instance): Rewrote, use nettle,
replaced methods with ordinary functions.
(mac_instance): New class, before it was just analias for
hash_instance.
* src/Makefile.am.in (liblsh_a_SOURCES): Removed md5.c and sha.c.
2002-01-17 Niels Mller <nisse@cuckoo.hack.org>
* src/md5.c, src/sha.c: Deleted files. The wrapper code was moved
to crypto.c, and now uses struct nettle_hash.
2002-01-16 Niels Mller <nisse@cuckoo.hack.org>
* src/pkcs5-test.c (main): Use crypto_hmac_sha1_algorithm.
* src/lock_file.c (do_lsh_file_lock): Improved error message.
* src/algorithms.c (all_symmetric_algorithms): Don't use
make_hmac_algorithm.
* src/crypto.c: Rewrote the hmac code to use Nettle.
* src/hmac.c, src/Makefile.am.in: Deleted file hmac.c.
2002-01-14 Niels Mller <nisse@cuckoo.hack.org>
* src/rsa.c (make_rsa_signer): Take advantage of rsa_public_key
and rsa_private_key being independent structs now. General cleanup
and deletion of old code.
* src/spki.c (spki_hash_sexp): Bugfix, don't hash the data once.
Bug reported by Werner Koch.
* src/sexp_parser.c (sexp_parse): Added advanced-hex syntax, as an
alias for the ordinary (but not implemented) advanced syntax.
* src/sexp.c: Added new format "advanced-hex" that uses hex
instead of base64.
(encode_hex): New function.
* src/rsa_keygen.c (rsa_generate_key): Renamed key type to
"rsa-pkcs1".
* src/rsa.c: Use nettle's rsa implementation. Deleted support for
rsa-md5. Needs some more cleanup.
* src/publickey_crypto.h: Moved rsa-related declarations here.
* src/rsa.h: rsa.h is now obsolete.
* src/lsh.c (read_user_keys): Added ATOM_RSA_PKCS1.
* src/server.c (read_host_key): Likewise.
* src/format.c (format_hex_string): Export this function.
* src/atoms.in: Added "rsa-pkcs1".
* src/algorithms.c (all_signature_algorithms): Deleted support for
rsa-md5.
2002-01-13 Niels Mller <nisse@cuckoo.hack.org>
* configure.in (lsh_cv_c_attribute): Consider __FUNCTION__ broken
in gcc-3.
2002-01-09 Niels Mller <nisse@cuckoo.hack.org>
* src/dsa.c (dsa_hash): Don't call sha1_final.
* src/dsa_keygen.c (hash): Likewise.
* src/lsh.h (struct lsh_string_header): Empty structs are not
allowed by ANSI-C, so don't declare this one unless debugging is
enabled.
* src/lsh_proxy.c: Don't use randomness_with_poll.
* src/lshd.c (main): Pass the correct type to make_simple_kexinit.
* src/md5.c (do_md5_digest): Don't call md5_final and md5_init.
* src/sha.c (do_sha_digest): Don't call sha1_final and sha1_init.
* src/rsync/generate.c, src/rsync/receive.c, src/rsync/send.c:
Removed calls of md5_final.
2001-12-16 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.3.6.
2001-12-16 Niels Mller <nisse@lysator.liu.se>
* src/lock_file.c: Include sys/types.h and sys/stat.h, needed on
Solaris.
2001-12-14 Niels Mller <nisse@lysator.liu.se>
* src/dsa_keygen.c (dsa_generate_key): Fixed declaration and code
mixup.
* src/rsa_keygen.c (rsa_generate_key): Likewise.
2001-12-14 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (CLEANFILES, DISTCLEANFILES): Added
fiels generated by the test, in order to make make distcheck
happy.
* src/used_headers: Update for automake-1.5, dependency files are
now named foo.Po.
* src/Makefile.am.in: Changed rules for prime_table.h and
digit_table.h. Now they depend only on the source file, not on the
executable.
* doc/lsh.texinfo (lsh-make-seed): New section.
(Files and environment variables): Wrote a file list.
2001-12-12 Niels Mller <nisse@cuckoo.hack.org>
* doc/lsh.texinfo (Files and environment variables): Documented
environment variables.
* misc/make-dist: Deleted the strip_rsa function.
* src/testsuite/functions.sh (LSH_YARROW_SEED_FILE): Export
variable. Also create the seed file if needed.
* src/testsuite/seed-test: Use the -q --sloppy flags when invoking
lsh-make-seed.
* src/sexp.c (sexp_format): Add newline at the end of the
"advanced" syntax representation. Changed all internal uses of
sexp_format to use the method SEXP_FORMAT instead.
* src/sexp-conv.c (main): Deleted code for newline-terminating
output.
* src/rsa.c (make_rsa_signer): Call mpz_init for all bignum
instance variables.
* src/lsh-make-seed.c: New option --server.
(main): If invoked with the quiet option (-q), never ask the user
to type randomly.
* src/lock_file.h (LSH_FILE_LOCK): New argument RETRIES.
* src/lock_file.c (do_lsh_file_lock): If locking fails,
optionally retry a few times.
* src/client_x11.c (make_forward_x11): Assert that the randomness
generator is of "good" quality.
* src/rsa_keygen.c (rsa_generate_key): Likewise.
* src/keyexchange.c (make_simple_kexinit): Likewise.
* src/dsa_keygen.c (dsa_generate_key): Likewise.
* src/dsa.c (generic_dsa_sign): Likewise.
* src/dh_exchange.c (make_dh): Likewise.
* src/Makefile.am.in (sbin_PROGRAMS): Install lsh-krb-checkpw in
$prefix/sbin, not $prefix/bin.
* src/randomness.c: Deleted old generators.
* src/randomness.h: Deleted all classes but randomness. New method
RANDOM_ADD.
* src/unix_random.c: Rewrote to use yarrow. Updated users.
* src/werror.c (werror_progress): Fixed test of verbose and quite
flags.
2001-12-08 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-pam-checkpw.c: New helper program for verifying
passwords against PAM. Written by Pontus Skld.
2001-12-07 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_user.c: Added comments on how to fix use of setuid.
* src/lsh-make-seed.c: Added option --sloppy.
* src/lsh-execuv.c: New file. Helper program for securely exec:ing
user programs.
2001-12-05 Niels Mller <nisse@cuckoo.hack.org>
* src/werror.c (werror_progress): New function.
* src/ssh-conv: Shortened if-statement.
* src/lsh-make-seed.c (main_argp_parser): Use the right default
file name.
(get_dev_mem): #if:ed out this code, it's dangerous on some
systems.
(get_system): Implemented this, including reading some /proc
files. Implemented
(get_interact): Implemented.
(main): Move locking later, until we want to write the file.
Implemented the actual writing of the seed-file data.
* src/lsh-authorize: Fixed bash-isms, don't use "if !", use "$HOME"
rather than "~".
* src/lock_file.c (do_lsh_file_lock): Initialize info attribute in
new object.
(do_lsh_file_lock_p): New function, corresponding to a new method
for checking if a lock exists, without creating one.
* src/client_x11.c (make_client_x11_display): Fixed werror format
string.
* src/channel_forward.c: Use CAST_SUBTYPE in channel_forward's
methods. Needed because it is subclassed as client_x11_channel.
* src/Makefile.am.in (liblsh_a_SOURCES): Added lock_file.c.
2001-12-02 Niels Mller <nisse@cuckoo.hack.org>
* src/lock_file.c, src/lock_file.c: New files. Locking mechanism
for the seed file.
2001-11-23 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-server.c (sftp_process_readdir): Clear errno
before calling readdir.
2001-11-22 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-server.c (sftp_attrib_from_stat): Bugfix, use |,
not ||. Noticed by Pontus Skld.
2001-11-20 Niels Mller <nisse@ehand.com>
* src/zlib.c (make_zlib_instance): Check return valus from
inflateInit and deflateInit.
* src/lsh-make-seed.c (update_zlib): New function.
(get_dev_mem): Implemented reading of /dev/mem.
2001-11-14 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-make-seed.c (get_dev_random): Implement reading of
/dev/random.
2001-11-14 Niels Mller <nisse@ehand.com>
* src/Makefile.am.in (bin_PROGRAMS): Added lsh-make-seed.
* src/lsh-make-seed.c: New program, for creating the initial seed
file.
* src/testsuite/seed-test: New file, testing lsh-make-seed.
2001-11-06 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Bumped version to 1.3.6.
2001-11-02 Niels Mller <nisse@ehand.com>
* src/server_session.c (do_eof): Use close_fd_write instead of
close_fd_nicely.
2001-10-30 Niels Mller <nisse@lysator.liu.se>
* src/client_session.c (make_client_session_channel): Added
fixme-comment.
2001-10-30 Niels Mller <nisse@ehand.com>
* src/channel_forward.c (do_channel_forward_eof): Don't call
shutdown(), use close_fd_write instead.
* src/io.c (do_write_callback): Use close_fd_write if buffer is
closed and becomes empty.
(close_fd_write): New function.
* src/rsa.c: Comment fixes.
2001-10-29 Niels Mller <nisse@ehand.com>
* src/testsuite/Makefile.am (TS_MORE_SH): Added lshg-1-test.
* src/server_session.c (do_eof): Signal EOF on the process' stdin.
2001-10-26 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-server.c (sftp_process_read): Use the same type
for done as for length, UINT32.
* src/xauth.c (xauth_lookup): Bugfix for ipv6 addresses.
2001-10-25 Niels Mller <nisse@ehand.com>
* src/sftp/buffer.c (READ_UINT64): Use off_t instead of UINT64,
which isn't defined.
2001-10-24 Niels Mller <nisse@ehand.com>
* src/read_packet.c (do_read_packet): If we get EOF on a packet
boundary, raise EXC_FINISH_READ, not EXC_PROTOCOL.
* src/connection.c (do_exc_connection_handler): Added a comment
for the EXC_FINISH_READ case.
* configure.in (BASH): Unset BASH if it has the value "/bin/sh".
2001-10-23 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/lshg-1-test: New test program.
* src/client.c (make_subsystem_request): New function, contributed
by Pontus Skld.
(client_options): New option --subsystem.
(client_subsystem_session): New function.
(client_command_session): Don't ask for a pty by default.
(client_maybe_pty): New argument default_pty.
(client_argp_parser): Handle subsystem option.
2001-10-22 Niels Mller <nisse@cuckoo.hack.org>
* Makefile.am.in (MAINTAINERCLEANFILES): Don't use += for
assigning this variable.
* src/Makefile.am.in (MAINTAINERCLEANFILES): Likewise.
2001-10-15 Niels Mller <nisse@ehand.com>
Released lsh-1.3.5.
* src/testsuite/cast128-test.m4: New cast-128 cbc testcase.
* src/crypto.c (crypto_cast128_cbc_algorithm): New algorithm,
replacing the code in cast.c.
(crypto_serpent256_cbc_algorithm): New algorithm, replacing the
code in serpent.c
* src/serpent.c, src/cast.c, src/blowfish.c, src/cbc.c,
src/cascade.c: Deleted files.
* src/abstract_crypto.c (crypto_invert): Deleted function.
(gcd): Deleted function.
(lcm): Deleted function.
* src/crypto.c (crypto_serpent256_cbc_algorithm): New algorithm,
replacing code in serpent.c.
* src/testsuite/blowfish-test.m4: New testcase for blowfish-128
cbc.
* src/crypto.c (crypto_blowfish_cbc_algorithm): New algorithm,
replacing the code in blowfish.c.
* src/Makefile.am.in (liblsh_a_SOURCES): Deleted blowfish.c.
* src/testsuite/twofish-test.m4: Updated test case to test
twofish_cbc.
* src/testsuite/des-test.m4: Updated test case to test des3_cbc.
* src/idea.c: Deleted file.
* src/des.c, src/twofish.c: Deleted files, replaced by code in
crypto.c.
* src/crypto.c (crypto_twofish256_cbc_algorithm): New algorithm,
replacing the code in twofish.c.
(make_des3_cbc_instance): Initialize the iv properly.
2001-10-14 Niels Mller <nisse@cuckoo.hack.org>
* src/crypto.c (crypto_aes256_cbc_algorithm): Renamed, was
aes256_cbc_algorithm.
(crypto_des3_cbc_algorithm): New algorithm, to replace the code in
des.c. Doesn't quite work yet.
* src/algorithms.c (all_symmetric_algorithms): Use
crypto_des3_cbc_algorithm.
* src/Makefile.am.in (liblsh_a_SOURCES): Deleted des.c.
2001-10-05 Niels Mller <nisse@ehand.com>
* src/arcfour.c, src/rijndael.c: Deleted files. Code moved to
crypto.c.
* src/testsuite/aes-test.m4: New testcase; NIST:s testcases for
aes256-cbc.
* src/testsuite/macros.m4 (TS_TEST_CRYPTO): Added optional 6:th
argument for iv.
* src/testsuite/Makefile.am (TS_PROGS): Added aes-test.
* src/crypto.h, src/crypto.c: Deleted aes128_cbc_algorithm and
aes192_cbc_algorithm.
2001-10-05 Niels Mller <nisse@cuckoo.hack.org>
* src/crypto.c: New file, with glue to Nettle.
* src/algorithms.c (all_symmetric_algorithms): Replaced references
to rijndael_algorithm with aes256_cbc_algorithm.
* src/Makefile.am.in (liblsh_a_SOURCES): Added crypto.c. Deleted
arcfour.c and rijndael.c.
2001-10-03 Niels Mller <nisse@ehand.com>
* src/Makefile.am.in (liblsh_a_SOURCES): Deleted sexp_commands.c
and spki_commands.c.
* src/sexp_commands.c, src/sexp_commands.h, src/spki_commands.c,
src/spki_commands.h: Deleted obsolete files.
* src/lshd.c (options2keys): New command, that uses read_host_key,
and replaces options2keyfile.
* src/lsh_proxy.c: Likewise.
* src/server.c (read_host_key): New function replacing
spki_read_hostkey.
* src/spki_commands.c (make_pkcs5_decrypt): Deleted function.
(do_spki_decrypt): Deleted function.
(spki_password_decrypt): Deleted class.
(make_spki_read_userkeys): Deleted function.
(spki_read_userkeys): Deleted expression.
(spki_return_userkeys): Deleted command.
(spki_add_userkey_command): Deleted command.
(do_spki_add_userkey): Deleted function.
(spki_read_userkey_context): Deleted class.
* src/spki.c (spki_sexp_to_signer): Added argument algorithm_name.
(spki_pkcs5_decrypt): New function, replacing make_pkcs5_decrypt.
* src/lsh.c (read_user_keys): New function, replacing
do_options2identities and make_spki_read_userkeys.
* src/spki_commands.c (make_spki_read_acls): Deleted function.
(spki_read_acl): Deleted expression.
(do_spki_add_acl): Deleted function.
(spki_add_acl_command): Deleted command.
(spki_command): Deleted class.
(spki_signer2verifier): Deleted command.
(spki_verifier2public): Deleted command.
* src/resource.c (do_kill_all): Added trace message.
* src/lsh.c (read_known_hosts): New function, replacing
make_spki_read_acls.
(do_options2known_hosts): Deleted function.
* src/client.c (make_client_session): Register the channel's
resource list with the gc.
* src/testsuite/lsh-7-test: New test, verifying that connecting,
without a proper entry in known_hosts, fails.
* src/testsuite/Makefile.am (TS_MORE_PROGS): Added lsh-7-test.
* src/sexp_commands.c (make_sexp_print_raw_hash): Deleted
function.
(sexp_print_raw_hash): Deleted command.
(do_sexp_print): Deleted function.
(make_sexp_print_command): Deleted function.
(make_sexp_print_to): Deleted function.
* src/spki.c (spki_sexp_to_signer): New function.
(spki_pkcs5_encrypt): New function.
* src/spki_commands.c (spki_sexp2signer_command): Deleted command,
replaced with function spki_sexp_to_signer.
(make_pkcs5_encrypt): Deleted, replaced with spki_pkcs5_encrypt
function.
* src/lsh-writekey.c: Rewrote to use io_read_file_raw and
write_raw, without using any commands or io_run.
* src/lsh-decode-key.c: Likewise.
2001-10-03 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh-export-key.c: No longer needs to include
sexp_commands.h.
* src/server_keyexchange.c (server_srp_read_verifier): Renamed
class (was srp_init_continuation) and changed super class to
abstract_write.
(do_server_srp_read_verifier): Work with new USER_READ_FILE
conventions.
(do_handle_srp_init): Likewise.
* src/lsh.h: Forward declare abstract_write.
* src/unix_user.c (exc_read_user_file_handler): New class.
(do_read_file): Updated for new USER_READ_FILE conventions.
* src/userauth.h (lsh_user): Changed the arguments to
USER_READ_FILE, now takes an abstract_write that will receive the
file contents, not command_continuation.
2001-10-02 Niels Mller <nisse@cuckoo.hack.org>
* src/spki.c (spki_hash_sexp): New function.
* src/spki_commands.c (make_spki_hash): Deleted function.
(spki_hash): Deleted class.
(spki_hash_md5): Deleted command.
(spki_hash_sha1): Deleted command.
* src/lsh-decode-key.c (do_decode_key): Free CONTENTS properly.
2001-10-02 Niels Mller <nisse@ehand.com>
* src/lsh-export-key.c (main): Rewrote to use io_read_file_raw and
write_raw, without using any commands or io_run.
* src/sexp-conv.c (main): Likewise.
* src/io.c (io_read_file_raw): New function, for reading an entire
file into a string. Uses string_buffer.
* src/gc.c (gc_final): Check that root_set is non-null before
calling KILL_RESOURCE_LIST.
2001-09-30 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (do_write_prepare): Deleted function.
(do_consuming_read): Deleted old code to deal with fd->hanged_up.
(do_write_callback): Call write_buffer_pre_write instead of
FD_PREPARE.
* src/io.h (FD_PREPARE): Deleted method.
2001-09-28 Niels Mller <nisse@cuckoo.hack.org>
* src/server_session.c (do_eof): Use close_fd_nicely instead of
write_buffer_close.
* src/sexp_test.c (do_close): Likewise.
* src/io.c (do_write_close): Deleted function.
(close_fd): Set the flag write_buffer->closed directly, instead of
calling FD_WRITE_CLOSE.
(close_fd_nicely): Don't use FD_WRITE_CLOSE, instead, set the
write_buffer->closed flag, and close the fd if the write_buffer is
empty.
* src/io.h (FD_WRITE_CLOSE): Deleted method.
* src/write_buffer.c (write_buffer_close): Deleted. The closed
flag is now set by close_fd and close_fd_nicely. Everybody else
should be using those functions.
* src/tcpforward_commands.c (install_forwarded_tcpip_handler):
Static command deleted, not used anywhere.
2001-09-28 Niels Mller <nisse@ehand.com>
* src/tty.c (tty_setwinsize): Rows and columns were mixed up.
Fixed.
* src/server_session.c (make_pty): Reorganized to be more
readable.
(spawn_process): DEleted local variable uses_pty. Instead NULL
session->pty if no pty is in use.
(do_window_change_request): Use the fd connected to the process'
stdin for manipulating the pty.
(do_alloc_pty): Check that we haven't started a process already.
2001-09-27 Niels Mller <nisse@ehand.com>
* src/server_session.h (window_change_request_handler): Declare
object.
* src/lshd.c (main): Install window_change_request_handler for
session channels.
* src/tcpforward_commands.c: Made some more objects static.
* src/spki_commands.c (spki_parse_key): Deleted class.
(spki_sexp2signer_command): Define using DEFINE_COMMAND2.
(spki_sexp2keypair_command): Likewise.
* src/sexp.c: Use const struct sexp * in more places.
* src/resource.c (dont_free_live_resource): Check that resource is
dead. Don't look at gc_final_p.
* src/lsh-export-key.c (do_ssh2_print_command): Updated for new
sexp_check_type prototype.
* src/spki.c: Likewise.
* src/srp_exchange.c (make_srp_entry): Likewise.
2001-09-27 Niels Mller <nisse@cuckoo.hack.org>
* src/resource.c (make_resource_list): Renamed functions, was
empty_resource_list. Updated all callers.
(dont_free_live_resource): #if:ed out check of gc_final_p.
* src/io_commands.c: Deleted old function do_io_read_file.
* src/io.c: Deleted old backend code.
(io_run): Check for OOP_ERROR. #if:ed out for now, as it is not
defined in liboop-0.7.
* src/client.c (accept_service_handler): Deleted exception_handler
attribute.
(do_accept_service): Use the connection's exception handler for
raising protocol error.
(make_accept_service_handler): Deleted exception_handler argument.
* src/channel.c (send_channel_request_responses): Deleted
connection argument.
(make_channel_request_response): Likewise.
(channel_request_exception_handler): Deleted connection attribute.
(make_channel_request_exception_handler): Deleted connection
argument.
2001-09-26 Niels Mller <nisse@ehand.com>
* src/server_session.c (shell_request_handler,
exec_request_handler): Defined as static objects using
DEFINE_CHANNEL_REQUEST. Updated users.
* src/io_commands.c (connect_simple_comand,
connect_connection_command): New static commands, replacing
make_simple_connect and make_connect_connection. Updated users.
* src/client_x11.c (channel_open_x11): Define as a static object
using DEFINE_CHANNEL_OPEN. Updated users.
* src/channel.h (DEFINE_CHANNEL_OPEN): New macro.
(DEFINE_CHANNEL_REQUEST): New macro.
* src/zlib.c (zlib_deflate): Bugfix: Call deflateEnd, not
inflateEnd, when deleting a deflate object. FIX copied from 1.2
branch.
* src/sftp/xmalloc.c: Include string.h.
2001-09-25 Niels Mller <nisse@ehand.com>
* src/gc.c (gc_register): Set gc_scheduled flag before creating
the gc callout.
* src/io.c (lsh_oop_time_callback): New function.
(lsh_oop_register_callout): New function.
(lsh_oop_cancel_callout): New function.
(do_kill_callout): New function.
(io_callout): Deleted delay argument, as delays are not currently
implemented.
* src/lsh-writekey.c (lsh_writekey_options2private_file): Dup
string before passing it to make_io_write_file_info.
(lsh_writekey_options2public_file): Updated call to
make_io_write_file_info.
* src/sexp.c (do_format_sexp_vector): Fixed string leak in
pretty-printing code.
* src/io_commands.c (make_io_write_file_info): Changed type of the
NAME argument. Now a struct lsh_string *.
* src/io.c (io_final): Call gc_final. That makes sure that all
callbacks are cancelled. Updated callers to not use gc_final, only
io_final.
* src/gc.c (gc_final): Always define gc_fianl, and kill the
resources in the root set. Deallocation and checks for leaks is
still done only when DEBUG_ALLOC is defined.
2001-09-24 Niels Mller <nisse@cuckoo.hack.org>
* src/xalloc.c (lsh_object_check): Better message on type error.
(lsh_object_check_subtype): Likewise.
* src/lsh-writekey.c (make_writekey): Chenged order of options and
stdin arguments. Delay call of read_sexp.
* src/command.c (gaba_apply): Assert that a value has been
returned.
2001-09-24 Niels Mller <nisse@ehand.com>
* src/scm/gaba.scm (process-expr): Handle empty parameter list.
* src/io.c: Deleted class io_backend. Register signal handlers and
files with gc_global() instead. Deleted all references to
io_backend in the rest of the source files. Doesn't quite work yet.
* src/gc.c (gc_global): New function.
(root_set): New global variable.
* Liboop code (without gc) seems to work now. Tagging as
MILESTONE_LIBOOP_20010924.
* src/write_buffer.c (write_buffer_close): Call close_fd if buffer
is empty.
* src/unix_interact.c (window_subscriber): Added attribute
interact, which points to the corresponding unix_interact.
(do_kill_window_subscriber): New function, which updates the
number of subscribers and removes the SIGWINCH handler if there
are no subscribers left.
(unix_interact): Added attributes backend, winch_handler and
nsubscribers.
(unix_window_change_subscribe): Keep track of number of
subscribers, and install the signal handler if it is needed.
(make_unix_interact): Don't install any signal handler yet.
* src/lshd.c (main): Changed the behaviour of the --no-syslog
option. Now --daemon --no-syslog puts the process into the
background without the rest of the daemonic setup. These option
names should be changed to something more correct, but it is used
only be the testsuite.
* src/io.c (lsh_oop_signal_callback): Better trace message.
(lsh_oop_signal_callback): Return OOP_CONTINUE.
(lsh_oop_fd_read_callback): Return OOP_CONTINUE.
(lsh_oop_register_read_fd): Check want_read, so we don't try to
register the callback twice.
(lsh_oop_fd_write_callback): Fixed assertion.
(lsh_oop_fd_write_callback): Return OOP_CONTINUE.
(lsh_oop_register_write_fd): Check want_write, so we don't try to
register the callback twice.
(io_run): Print a trace message if/when oop_sys_run returns.
(do_connect_callback): Improved trace messages.
(io_connect): Initialize fd->write before calling
lsh_oop_register_write_fd.
(io_listen): Initialize fd->read before calling
lsh_oop_register_read_fd.
(close_fd): Call lsh_oop_cancel_read_fd and
lsh_oop_cancel_write_fd before clearing the alive flag.
2001-09-23 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c: Added trace messages to liboop-related functions.
* src/write_buffer.c: Include io.h.
2001-09-21 Niels Mller <nisse@ehand.com>
* configure.in: Check for liboop.
* src/io.c (make_io_backend): Call new function io_init().
(lsh_oop_register_read_fd): Updated the want_read flag. Changed
most functions to call this function instead of updating the flag
directly.
(lsh_oop_cancel_read_fd): Likewise.
(lsh_oop_register_write_fd): Analogous changes for the want_write flag.
(lsh_oop_cancel_write_fd): Likewise.
(do_exc_finish_read_handler): Use lsh_oop_register_read_fd and
lsh_oop_cancel_read_fd.
* src/write_buffer.c (make_write_buffer): Added fd argument.
(do_write): Call lsh_oop_register_write_fd when buffer gets
non-empty.
* src/reaper.c (make_reaper): Adapted to new io_signal_handler
behaviour.
* src/unix_interact.c (make_unix_interact): Likewise.
* src/channel_forward.c (do_channel_forward_send_adjust): Use
lsh_oop_register_read_fd.
* src/client_session.c (do_send_adjust): Likewise.
(do_client_io): Likewise.
* src/server_session.c (do_send_adjust): Likewise.
2001-09-19 Niels Mller <nisse@ehand.com>
* src/server_keyexchange.c (do_init_server_dh): Fixed bug in the
PEER_SSH_DSS_KLUDGE workaround. FIX copied from 1.2 branch.
2001-09-18 Niels Mller <nisse@ehand.com>
* src/io.c (lsh_oop_cancel_signal): New function.
(do_write_callback): Call FD_PREPARE.
(close_fd): Call lsh_oop_cancel_fd.
(close_fd_nicely): Likewise.
(close_fd_read): Likewise.
2001-09-18 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (lsh_oop_glue): New class.
(make_lsh_oop_glue): New function.
(lsh_oop_signal_callback): New function.
(lsh_oop_register_signal): New function.
(lsh_oop_fd_callback): New function.
(lsh_oop_register_fd): New function.
2001-09-17 Niels Mller <nisse@ehand.com>
* src/io.c: Started experimental conversion to use liboop.
2001-09-16 Niels Mller <nisse@cuckoo.hack.org>
* doc/lsh.texinfo: Moved table of contents first.
* src/dsa.c (do_dsa_sign): Display any unexpected algorithm atom
before crashing.
2001-09-13 Niels Mller <nisse@ehand.com>
* src/io.c (address_info2sockaddr): Fixed debug invocation. FIX
copied from 1.2 branch.
2001-09-12 Niels Mller <nisse@ehand.com>
* src/werror.c (werror_vformat): Don't crash if %a gets a zero
argument. FIXED in 1.2 branch.
2001-09-09 Niels Mller <nisse@cuckoo.hack.org>
* src/des.c (make_des_instance): Use the des_fix_parity function
in nettle.
2001-09-05 Niels Mller <nisse@ehand.com>
* src/crypto.h: Deleted last traces of idea support.
* src/atoms.in: Likewise.
* src/algorithms.c: Likewise.
* src/Makefile.am.in: Likewise.
* src/testsuite/lsh-6-test: New test, exercising the various -c
options.
* configure.in: Bumped version to 1.3.5.
2001-09-04 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.3.4.
2001-09-04 Niels Mller <nisse@ehand.com>
* doc/lsh.texinfo: Updated for 1.3.4. In particular, added doc on
X forwarding, -x, -B, and --log-file options, and encrypted
private keys. Deleted the paragraph about the obsolete --userauth
option.
* src/client.c (client_command_session): Ask for a pty also for
(supposedly non-interactive) exec sessions.
2001-09-03 Niels Mller <nisse@cuckoo.hack.org>
* src/xauth.c (xauth_process): New function, using XauReadAuth.
(xauth_lookup): Use xauth_process instead of XauGetAuthByAddr.
* src/client_x11.c (make_client_x11_display): Initialize the fake
cookie properly.
* src/xauth.h: New file with the xauth_lookup prototype.
* src/xauth.c (xauth_lookup): Deleted address_length argument. Bug
fixes.
2001-09-03 Niels Mller <nisse@ehand.com>
* src/xauth.c: Rewrote to use libXau.
* src/client_x11.c (client_x11_auth_info): Deleted class; merged
with client_x11_display.
(parse_display): Take a client_x11_display as argument. Do xauth lookup.
(get_client_x11_auth_info): Deleted function.
* src/client.c (DEFINE_CALLBACK): Declare self argument as UNUSED.
* src/Makefile.am.in (liblsh_a_SOURCES): Added xauth.c.
* configure.in: Check for X, libXau and XauGetAuthByAddr.
* src/client_x11.c (client_x11_channel): New fields auth_length
and name_length, for recording the decoded lengths in the setup
message.
(X11_SETUP_MAX_LENGTH): Defined as 48, which is the size of a message
with a 16 octet cookie.
Updated description of the X11 connection setup message.
(LE_READ_UINT16, LE_WRITE_UINT16): New macros.
(do_client_channel_x11_receive): Bug fixes, seems to work now.
* src/suspend.h: Declare suspend_callback as extern. Noticed by
Jean-Pierre.
2001-09-03 Niels Mller <nisse@cuckoo.hack.org>
* src/client_x11.c: Added comment about observed X11 packets (that
seem contrary to the documentation in RFC 1013.
(do_client_channel_x11_receive): Print received cookie, for
debugging purposes.
(make_forward_x11): Print generated fake cookie, for debugging
purposes.
(parse_display): Fixed ssh_format invocation creating the local
socket name.
(do_channel_open_x11): Fixed invocation of verbose().
(do_format_request_x11_forward): Get the connection from the
channel, now that the connection pointer is available there.
(do_format_request_x11_forward): Hex encode the cookie. That's
ugly, but needed for compatibility.
* src/client_pty.c: Dropped lsh:-prefix on messages, it's added
automatically in werror.c.
* src/client.c (client_maybe_x11): Write a message if DISPLAY not
set or it's value doesn't make sense.
2001-09-02 Niels Mller <nisse@cuckoo.hack.org>
* src/client.c (make_client_session): Added escape sequences q, v
and d, for controlling the verbosity flags.
(client_argp_parser): Look at used_x11 after setting up the shell
session.
* src/lshg.c (make_options): Pass NULL random to
init_client_options.
* src/client_x11.c (make_client_x11_display): Free the fake cookie
if we fail.
(make_forward_x11): Make up a random cookie.
* src/client.c (init_client_options): New argument RANDOM.
(client_maybe_x11): Pass on RANDOM to make_forward_x11.
* src/client.h (client_options): Moved RANDOM attribute here, from
lsh_options.
2001-09-01 Niels Mller <nisse@cuckoo.hack.org>
* src/client.c: Moved -x option to lsh.c.
* src/channel.c (register_channel): Deleted connection argument.
* src/channel.h (ssh_channel): Replaced the write pointer with a
pointer to the connection.
(channel_request): Deleted connection argument.
* src/channel.h (CHANNEL_REQUEST): Likewise.
* src/resource.c (init_resource): Renamed from resource_init, for
consistency. Updated all callers.
* src/lsh.h (struct client_x11_display): Forward declare.
* src/client_x11.h: Deleted, prototypes moved to client.h.
* src/client.h (client_options): New attributes with_x11 and
used_x11.
* src/client.c (client_maybe_pty): New function.
(client_maybe_x11): New function.
(client_shell_session): Use client_maybe_pty and client_maybe_x11.
(client_command_session): Use client_maybe_x11.
(client_argp_parser): --x11-forward should be a modifier option,
not an action.
* src/channel.h (channel_table): Added attribute x11_display.
* src/Makefile.am.in (liblsh_a_SOURCES): Added client_x11.c.
2001-08-31 Niels Mller <nisse@ehand.com>
* src/client.c (client_argp_parser): Implemented -X flag.
2001-08-30 Niels Mller <nisse@cuckoo.hack.org>
* src/xauth.c: New file.
* src/client_x11.c: Work in progress.
(client_x11_auth_info): New class.
* src/channel_forward.c (init_channel_forward): New function,
extracted from make_channel_forward.
2001-08-30 Niels Mller <nisse@ehand.com>
* configure.in: Bumped version to 1.3.4.
2001-08-29 Niels Mller <nisse@cuckoo.hack.org>
* Released lsh-1.3.3.
2001-08-29 Niels Mller <nisse@ehand.com>
* src/sftp/testsuite: Fixed scripts to work outside of $srcdir.
* src/sftp/buffer.c, src/sftp/client.c: Include string.h.
* src/algorithms.c (all_symmetric_algorithms): Use aes256-cbc as
an alias for rijndael.
(lookup_crypto): Recognize aes256-cbc, aes-cbc and aes.
2001-08-23 Niels Mller <nisse@ehand.com>
* src/connection.c (do_exc_connection_handler): Display exception
message. Suggested by Jonas Bofjll. XXX: Fix in 1.2 branch.
2001-08-28 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/testsuite/run-tests: Use srcdir when starting scripts.
* src/Makefile.am.in (liblsh_a_SOURCES): Added channel_forward.c.
* src/channel_forward.h: Renamed the tcpip_channel to
channel_forward, and moved it to a separate file. It's not really
tcpip-forwarding specific, and can be reused for x11-forwarding.
* src/lsh_types.h (READ_UINT16): Fixed shift count. XXX: Fix in
1.2 branch.
* src/parse.c (parse_uint16): New function.
(parse_string16): New function.
2001-08-27 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/testsuite/Makefile.am (EXTRA_DIST): Use EXTRA_DIST, not
DISTFILES. cd to $srcdir when running the tests.
* src/sftp/Makefile.am (EXTRA_DIST): Include header files in the
dist.
* buffer.c, buffer.h, client.c, client.h: Added copyright notices.
* src/sftp/testsuite/Makefile.am: New file.
* src/sftp/sftp-server.c (struct sftp_file): New struct with fd
and position.
(enum struct sftp_handle_type): Renamed constants to
HANDLE_TYPE_FILE and HANDLE_TYPE_DIRECTORY.
(handle_t): Deleted typedef.
(HANDLE_FILE): New macro replacing HANDLE_FD.
(sftp_read): New function. Keep track of position, and use
seek/pread only when appropriate.
(sftp_write): Likewise.
* src/sftp/configure.in (AC_OUTPUT): Generate testsuite/Makefile.
* src/sftp/client.c: Minor fixes; deleted unused variables, static
declared functions.
* src/sftp/Makefile.am (SUBDIRS): Added testsuite.
* src/Makefile.am.in (SUBDIRS): Added sftp.
* misc/bootstrap.sh: Bootstrap the src/sftp subdirectory.
* configure.in: Configure the src/sftp subdirectory.
2001-08-26 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/export-1-test: Don't use $srcdir for finding
lsh-export-key.
* src/zlib.c (do_zlib): Don't print any message if Z_BUF_ERROR
happens with avail_in = 0.
* src/lshd.c (main_options): New experimental option --subsystems.
(parse_subsystem_list): New function.
(main_argp_parser): Handle --subsystems.
(main): Install a subsystems handler, if appropriate.
* src/server_session.c (shell_request): Deleted unused reaper
attribute.
(lookup_subsystem): New function.
(do_spawn_subsystem): New function.
(make_subsystem_handler): New function.
2001-08-21 Niels Mller <nisse@ehand.com>
* src/client_userauth.c (make_client_publickey_auth): Initialize
TYPE attribute properly.
* src/server_userauth.c (server_userauth_none): New authentication
method.
* src/lshd.c (main_argp_parser): Install a handler for the "none"
authentication method.
(main): Always require user authentication (used to allow clients
to start the ssh-connection service directly, under the same
restrictions as for "none" authentication).
* src/lsh.c (main_options): Deleted options --userauth and
--no-userauth.
(lsh_login_command): Try the "none" authentication method.
* src/handshake.c (handshake_command): Use CAST_SUBTYPE.
* src/connection_commands.c (connection_if_srp): Deleted command.
* src/command.c (do_command_4): Use CAST_SUBTYPE, in case
command_4 is inherited.
(do_command_3): Use CAST_SUBTYPE, in case command_3 is inherited.
(do_command_2): Use CAST_SUBTYPE, command_2 is inherited by
sexp_print_command.
* src/client_userauth.c (format_userauth_none): New function.
(make_client_none_auth): New function.
2001-08-12 Niels Mller <nisse@cuckoo.hack.org>
* src/client.c (do_exit): New callback function.
(make_client_session): Bind the sequence <escape> . to exit.
(client_options): New action option -B, --background.
(background_process): New command.
(client_argp_parser): Implement -B.
* src/lshg.c (main_argp_parser): Check that make_gateway_address
doesn't return NULL. XXX: Fix in 1.2 branch.
(options2info): Use self->gateway. XXX: Fix in 1.2 branch.
2001-07-30 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/export-1-test: Fixed invocation of compare_output.
2001-07-06 Niels Mller <nisse@cuckoo.hack.org>
* src/io_commands.c (io_write_file_command): Bugfix.
* src/command.h (command_simple): Deleted class.
(STATIC_COMMAND_SIMPLE): Deleted macro.
(DEFINE_COMMAND_SIMPLE): Deleted macro.
(catch_command): Inherit command, not command_simple.
* src/command.c (do_call_simple_command): Deleted.
(catch_collect_body): Inherit command, not command_simple.
* src/sexp_commands.h (sexp_print_command): Inherit command_2.
* src/lsh_proxy.c (proxy_destination): Use DEFINE_COMMAND2.
* src/lsh-writekey.c: Don't use DEFINE_COMMAND_SIMPLE.
* src/lsh.c: Likewise.
* src/lshd.c: Likewise.
* src/lshg.c: Likewise.
* src/proxy.c: Likewise.
* src/spki_commands.c: Likewise.
* src/keyexchange.c (kexinit_filter): Redefined using
DEFINE_COMMAND2.
* src/io_commands.c (io_write_file_command): Use DEFINE_COMMAND.
(connect_local_command): Likewise.
(io_log_peer_command): Likewise.
* src/gateway_commands.c (gateway_setup_command): Use
DEFINE_COMMAND.
(gateway_accept): Use DEFINE_COMMAND2.
* src/lsh-writekey.c: Don't use command_simple.
* src/connection_commands.c (connection_remember): Redefined using
DEFINE_COMMAND2.
* src/channel.c (connection_service_command): Use DEFINE_COMMAND,
not DEFINE_COMMAND_SIMPLE.
* src/client.c (client_options2remote): Likewise.
(client_options2actions) Likewise.
2001-07-05 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (TS_SH): Added export-1-test.
* src/lsh-export-key.c (ssh2_print_command): Inherit command_2.
Don't use command_simple.
2001-07-04 Niels Mller <nisse@cuckoo.hack.org>
* src/command.c (collect_state_1): Deleted class.
(collect_state_1): Deleted class.
(collect_state_2): Deleted class.
(collect_state_3): Deleted class.
(make_collect_state_1): Deleted function.
(make_collect_state_2): Deleted function.
* src/command.h (command_2): Made invoke a method, not a function
pointer. Updated users.
(COMMAND_2_INVOKE): New macro.
(collect_info_3): Deleted class.
(collect_info_2): Deleted class.
(collect_info_1): Deleted class.
(STATIC_COLLECT_1): Deleted macro.
(STATIC_COLLECT_2): Deleted macro.
(STATIC_COLLECT_2_FINAL): Deleted macro.
(STATIC_COLLECT_3_FINAL): Deleted macro.
* src/channel_commands.h (install_info): Inherit command_2,
instead of collect_info_2.
* src/testsuite/functions.sh (spawn_lshd): Pass --no-syslog to
lshd, not --log-file.
* src/tcpforward_commands.c (open_forwarded_tcpip): Redefined
using DEFINE_COMMAND2.
(open_direct_tcpip): Likewise.
(remote_listen_command): Likewise.
(make_request_tcpip_forward_command): Deleted function. Moved code
to remote_listen_command.
(make_direct_tcpip_handler): Redefined using DEFINE_COMMAND.
(make_tcpip_forward_handler): Likewise.
* src/sexp_commands.c (sexp_print_raw_hash): Redefined using
DEFINE_COMMAND3.
* src/proxy.c (chain_connections): Redefined using DEFINE_COMMAND3.
* src/command.c (do_trace_continuation): Use trace(... %t ...).
* src/werror.c (logfile_flag): Deleted global variable.
(werror_vformat): Added %t, for printing the object type.
* src/lshd.c: New option --no-syslog.
* src/io_commands.c (listen_with_callback): Redefined using
DEFINE_COMMAND3.
* src/handshake.c (handshake_command): Redefined using
DEFINE_COMMAND4.
* src/connection_commands.c (connection_if_srp): Redefined using
DEFINE_COMMAND3.
(make_connection_if_srp): Use make_command_3_invoke_2.
* src/combinators.c (command_Cp): Bugfix, changed argument order.
2001-07-03 Niels Mller <nisse@ehand.com>
* src/testsuite/runtests (srcdir): By default, use `pwd`, not ".".
* src/testsuite/functions.sh: Don't set srcdir here.
(spawn_lshd): Send messages to lshd.log.
* src/werror.c (logfile_flag): New global variable.
(syslog_flag): Deleted.
(werror_argp_parser): Set logfile_flag of a log file option is
encountered.
* src/lshd.c (main): Don't use syslog if the user provided an
explicit log-file option.
* src/combinators.c (command_C): Redefined using DEFINE_COMMAND3.
(command_Cp): Redefined using DEFINE_COMMAND4, but disabled the
new version as it doesn't quite work.
* src/testsuite/macros.m4: Include string.h.
* src/combinators.c (command_Sp): Redefined using
DEFINE_COMMAND4.
(command_B): Redefined using DEFINE_COMMAND3.
(command_Bp): Redefined using
DEFINE_COMMAND4.
* src/command.c (command_4_invoke_3): New class.
(make_command_4_invoke_3): New function.
(command_4_invoke_2): New class.
(make_command_4_invoke_2): New function.
(command_4_invoke): New class.
(make_command_4_invoke): New function.
* src/command.h (command_4): New class.
(DEFINE_COMMAND4): New macro.
* src/gateway_commands.c: Include string.h.
* configure.in: Bumped version to 1.3.3.
2001-07-02 Niels Mller <nisse@cuckoo.hack.org>
* src/combinators.c (command_I): Redefined using DEFINE_COMMAND.
Updated users as the type was changed in the process.
(command_K): Redefined using DEFINE_COMMAND2.
(command_S): Redefined using DEFINE_COMMAND3.
* src/command.c: New class.
(make_command_2_invoke): New function.
(command_3_invoke_2): New class.
(make_command_3_invoke_2): New function.
(command_3_invoke): New class.
(make_command_3_invoke): New function.
(progn_command): Use DEFINE_COMMAND isntead of
DEFINE_COMMAND_SIMPLE.
* src/command.h: Started replacing command_simple and the
collect_info_n classes with simpler schemes.
(command_2): New class.
(DEFINE_COMMAND2): New macro.
(command_3): New class.
(DEFINE_COMMAND3): New macro.
* src/connection_commands.c (connection_require_userauth): Changed
invocation of DEFINE_COMMAND.
* src/gateway_commands.c (gateway_init): Likewise.
* src/command.h (DEFINE_COMMAND): Changed macro to not take the
function arguments as arguments.
* src/command.c (gaba_apply): Rewrote to not use
COMMAND_SIMPLE_CALL.
(do_command_unimplemented): Deleted function.
2001-06-27 Niels Mller <nisse@cuckoo.hack.org>
* acinclude.m4: Added template for socklen_t definition.
* acconfig.h: Deleted definitions, use AH_TEMPLATE in configure.in
instead. Can this file be removed completely now?
* configure.in: Added AH_TEMPLATE calls. Deleted test for
offsetof.
* src/client_escape.c (newlinep): New function.
Treat NL and CR equivalently.
(scan_escape): Simplified. Also doesn't use memchr anymore.
* src/io.c (io_listen_local): Use plain offsetof.
(io_connect_local): Likewise.
* src/lsh_types.h (OFFSET_OF): Deleted definition, simply trust
stddef.h.
* src/server_userauth.c (do_exc_userauth_handler): Let the
connection's exception handler deal with EXC_PROTOCOL (fixed
somewhat differently in the 1.2.x branch).
2001-06-26 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Deleted IDEA support.
* src/process_atoms (atom2define): Changed invocation of tr to be
compatible with the Solaris 8 tr.
2001-06-26 Niels Mller <nisse@ehand.com>
* src/client_escape.c (NEWLINE): New macro.
(do_escape_handler): Reset state to GOT_NONE appropriately.
* src/client.c (client_argp_parser): Added empty statement after
label.
(make_client_session): Bind ^Z to suspend.
2001-06-24 Niels Mller <nisse@cuckoo.hack.org>
* src/xalloc.h (CHECK_TYPE) [DEBUG_ALLOC]: Added parentheses.
* src/xalloc.h (CHECK_SUBTYPE) [DEBUG_ALLOC]: Likewise.
* src/werror.c (werror_vformat): Implemented the 'p' (paranoia)
modifier for %c.
* src/client_escape.c (escape_dispatch): Use %pc with werror.
* src/client.c (make_client_session): Check if stdin is a tty,
when deciding on the default for escape char handling.
2001-06-20 Niels Mller <nisse@cuckoo.hack.org>
* src/client_escape.c (do_escape_handler): Fixed the EOF case.
2001-06-19 Niels Mller <nisse@cuckoo.hack.org>
* src/client_session.c (client_read_stdin): New function, for
installing the escape-char handler on stdin.
(do_client_io): Use client_read_stdin.
(make_client_session_channel): Added argument escape.
* src/client_escape.c: Moved suspend-related code to suspend.c.
* src/client.c (client_escape_info): New function.
(client_options): New option ---escape-char or 'e'.
(make_client_session): Seet up escape char info.
(client_argp_parser): Handle escape-char option. Call
suspend_install_handler.
* src/Makefile.am.in (liblsh_a_SOURCES): Added suspend.c.
* src/unix_interact.c: Moved suspend-related code to suspend.c.
* src/suspend.c, src/suspend.h: New files.
* configure.in: Bumped version to 1.3.2.
2001-06-17 Niels Mller <nisse@cuckoo.hack.org>
* src/rsync/rsync.h: Include <inttypes.h>, not <stdint.h>.
* src/channel.c (alloc_channel): Initialize new channel-entries to
NULL.
* src/cast.c: Adapted to nettle.
* Makefile.am.in (DOTDISTS): Deleted references to the symmetric
subdirectory.
(MAKEFILESAM): Likewise.
* configure.in (AC_CONFIG_FILES): Likewise.
* doc/HACKING (ROAD MAP): Updated to mention nettle.
* doc/lsh.texinfo: Added @dircategory and @direntry.
* src/twofish.c: Adapted to nettle.
2001-06-15 Niels Mller <nisse@ehand.com>
* src/blowfish.c: nettle updates.
* src/serpent.c: Likewise.
* configure.in: Configure in the src/nettle sub directory.
* misc/bootstrap.sh: Invoke the nettle .bootstrap script.
2001-06-13 Niels Mller <nisse@ehand.com>
* misc/bootstrap.sh: Bootstrap the nettle subdirectory.
* src/rsync/: Updated to libnettle conventions.
* configure.in (CPPFLAGS): Add -LSH and -I$srcdir/src, needed by
src/rsync/.
2001-06-12 Niels Mller <nisse@cuckoo.hack.org>
* src/dsa.c, src/dsa_keygen.c, src/md5.c, src/rijndael.c,
src/sha.c: Adapted to the nettle API.
* configure.in: Use src/nettle instead of src/symmetric.
* src/Makefile.am.in: Likewise.
* src/testsuite/Makefile.am: Likewise.
2001-06-09 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (do_consuming_read): In the EOF case, call
close_fd_read after A_WRITE.
2001-06-07 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (do_kill_io_backend): Let close_fd do it's work.
2001-06-06 Niels Mller <nisse@cuckoo.hack.org>
* src/io.c (close_fd): Really close the fd, and invoke any close
callback.
(io_iter): Simplified handling of closed files. Simply unlink
them, close_fd has to do the rest of the work.
2001-05-29 Niels Mller <nisse@cuckoo.hack.org>
* acinclude.m4: AC_CHECK_MEMBER: Deleted definition (a similar
macro is included in autoconf-2.50).
AC_CHECK_VAR: Deleted.
(AC_CHECK_KRB_LIB): Don't use changequote.
* configure.in: Set SRP_PROGRAM.
Require autoconf-2.50.
Use the new AC_CHECK_MEMBERS macro.
* src/unix_user.c: Update for autoconf-2.50, changed HAVE_UT_NAME
to HAVE_STRUCT_UTMP_NAME, and similarly for other defines.
2001-05-23 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Some cleanup, and update for autoconf-2.50. Some
more work needed.
2001-05-17 Niels Mller <nisse@ehand.com>
* configure.in: Set SRP_PROGRAM.
* src/Makefile.am.in (EXTRA_PROGRAMS): Added srp-gen.
(bin_PROGRAMS): Use SRP_PROGRAM, don't compile srp-gen if
SRP-support is disabled.
* src/testsuite/write-key-2-test: Fixed test; check for output
files in the testhome directory.
* src/unix_user.c: Fixed dummy definition of struct utmp (spotted
by Tomi Ollila).
2001-05-16 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Bumped version to 1.3.1.
* Released 1.3.0.
2001-05-15 Niels Mller <nisse@ehand.com>
* src/scm/gaba.scm: Some more cleanup.
* src/lshd.c (do_exc_lshd_handler): Handle EXC_RESOLVE. FIXED in
1.2 branch (2001-09-13).
* src/testsuite/functions.sh (spawn_lshd): Use 127.0.0.1 instead
of localhost. FIXED in 1.2 branch (2001-09-13).
* src/scm/gaba.scm (append-deep): Deleted.
(type->category): Deleted.
(type->declaration): Deleted.
(type->mark): Deleted.
(type->free): Deleted.
(fix-method): Deleted.
(do-instance-struct): Deleted.
(do-struct): Deleted.
(do-mark-function): Deleted.
(do-free-function): Deleted.
(do-struct-mark-function): Deleted.
(do-struct-free-function): Deleted.
(do-class): Deleted.
2001-05-15 Niels Mller <nisse@ehand.com>
* src/scm/gaba.scm: Rewrote the functions for generating C code.
2001-05-15 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Updated version number to 1.3.0.
2001-05-14 Niels Mller <nisse@cuckoo.hack.org>
* src/gc.c (gc) [!DEBUG_ALLOC]: Don't use number_of_strings.
2001-05-11 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/functions.sh (PIDFILE): New variable, with
absolute path to the pid-file. FIXED in 1.2 branch.
(spawn_lshd): $PIDFILE. FIXED in 1.2 branch.
2001-05-03 Niels Mller <nisse@ehand.com>
* src/lshd.c (main): Start the background randomness poll *after*
forking into the background. FIXED in 1.2 branch.
* src/testsuite/functions.sh (spawn_lshd): Use --daemon flag.
2001-05-02 Niels Mller <nisse@cuckoo.hack.org>
* sexp_streamed_parser.c: Deleted file.
* src/unix_user.c (format_env_pair): Return const char *.
(format_env_pair_c): Likewise.
(do_exec_shell): Use const char ** for argv and envp.
* src/xalloc.c (lsh_free): Cast to void * before calling free, as
free doesn't accept const void *.
(lsh_string_free): Changed argument type to const struct
lsh_string *.
(lsh_space_free): Bug-fix.
(lsh_space_alloc): Use lsh_malloc, not xalloc directly.
(lsh_space_free): Changed argument type to const void *.
* src/userauth.h (lsh_user): Use const char ** for argv.
2001-05-01 Niels Mller <nisse@cuckoo.hack.org>
* src/unix_interact.c (unix_read_password): Use const prompt
string.
(unix_yes_or_no): Likewise.
* src/srp_exchange.c (make_srp_entry): Use const struct lsh_string
for the salt.
* src/spki_commands.c (do_spki_decrypt): Use const struct lsh_string.
* src/spki.c (subject_match_hash): Use const struct lsh_string.
(do_spki_tag_prefix_match): Likewise.
(spki_subject_by_hash): Likewise.
(do_spki_lookup): Likewise.
* src/sexp_parser.c (skip_space): New function, skipping
whitespace and comments.
(sexp_parse_transport): Allow whitespace and comments.
* src/sexp_commands.c: Don't use the streamed sexp parser.
(sexp_parser): New class.
(do_sexp_parse_once): New function.
(do_sexp_parse_many): New function.
(do_read_sexp_continue): Deleted function.
(make_read_sexp_continuation): Deleted function.
(read_sexp_exception_handler): Deleted class.
(do_read_sexp_exception_handler): Deleted function.
(make_read_sexp_exception_handler): Deleted function.
(make_sexp_parser): New function.
(make_read_sexp_command): New argument MAX_SIZE.
* src/sexp.c: Constification, use const struct lsh_string for all
sexp-related strings.
2001-04-26 Niels Mller <nisse@cuckoo.hack.org>
* src/scm/gaba.scm: Added const type modifier.
* src/sexp-conv.c (MAX_SEXP_SIZE): New constant, used with
make_read_sexp_command.
* src/server_session.c (do_spawn_exec): Use const char * for argv
entries.
* src/server_keyexchange.c (MAX_SRP_SIZE): New constant, used with
make_read_sexp_command.
* src/lsh-writekey.c (MAX_SEXP_SIZE): New constant. Used with
STATIC_READ_SEXP.
* src/lsh-export-key.c (MAX_KEY_SIZE): New constant. Use with
make_read_sexp_command.
* src/io.c (do_buffered_read): Call close_fd_read on error. This
way, the user doensn't have to use an exception handler just for
closing the file.
* src/interact.h (interact): Use const for prompt arguments.
* src/format.c (lsh_get_cstring): Use const for input and output.
* src/pkcs5.c (pkcs5_derive_key): Declare password and salt input
as const.
* src/abstract_crypto.c (crypt_string): Declare the input string
const. Nevertheless, reuse it for output in case FREE is true.
(crypt_string_pad): Declare input string const.
(crypt_string_unpad): Likewise.
* src/Makefile.am.in (liblsh_a_SOURCES): Deleted
sexp_streamed_parser.c.
2001-04-25 Niels Mller <nisse@ehand.com>
* src/keyexchange.c (do_handle_newkeys): Added verbose message
when receiving NEWKEYS.
(do_handle_kexinit): Added verbose message when receiving KEXINIT
message.
* src/parse.c (parse_next_atom): Tolerate empty atoms, for
compatibility with "SSH-1.99-2.0.13 (non-commercial)". XXX Fix in
1.2 branch?
2001-04-17 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (TS_MORE_SH): Added tests
lshg-cat-test, lshg-cat-2-test and ssh1-fallback-test.
* src/testsuite/functions.sh: Renamed SERVERFLAGS to LSHD_FLAGS,
CLIENTFLAGS to LSH_FLAGS, and added LSHG_FLAGS.
* src/testsuite/lshg-cat-2-test: New test.
* src/testsuite/lshg-cat-test: Sleep some, waiting for lsh to
connect.
* src/sftp/.bootstrap: Don't run ./configure.
* src/werror.c (werror_argp_parser): Initialize program_name at
ARGP_KEY_INIT time.
* src/resource.c (dont_free_live_resource): Be more quiet during
gc_final.
* src/lshg.c (do_exc_lshg_handler): Fixed werror format string.
Fixed in 1.2 branch.
* src/lsh.c (do_lsh_lookup): If the user decides to trust the key,
add it to the spki_context.
* src/lcp: Replaced the bashism "==" with "=".
* src/gc.c (gc_final_p): New variable, non-zero during gc_final().
* src/client_session.c (make_client_session_channel): Register
stdio files as resources.
2001-04-12 Niels Mller <nisse@cuckoo.hack.org>
* src/lshd.c (main_argp_parser): Bugfix: Use the supplied
interface! Fixed in 1.2 branch.
* src/testsuite/ssh1-fallback-test: New test.
* src/testsuite/lshg-cat-test: New test.
* src/testsuite/fake-sshd1: New file.
* src/testsuite/functions.sh (spawn_lshd): Pass arguments to lshd.
Fixed in 1.2 branch.
(exec_lshg): New function.
* src/ssh1_fallback.c (fall_back_to_ssh1): Reset the fd to
blocking mode. Fixed in 1.2 branch.
* src/io.c (io_set_blocking): New function. Added in 1.2 branch.
(do_exc_finish_read_handler): Close fd immediately on
EXC_FINISH_IO. Fixed in 1.2 branch.
2001-04-11 Niels Mller <nisse@cuckoo.hack.org>
* src/userauth.h (lsh_process): New class.
(lsh_user): The fork_method now returns the child as an
lsh_process.
* src/unix_user.c (process_resource): Inherit lsh_process.
(do_signal_process): New function.
* src/unix_interact.c (install_suspend_handler): New function.
(stop_handler): New signal handler for TSTP, that sets and resets
the tty modes.
* src/tty.c (tty_getwinsize): Take a struct terminal_dimensions *
as argument.
(tty_setwinsize): Likewise.
* src/server_session.c (server_session): Changed type of process
attribute to lsh_process. Updated uses.
(do_alloc_pty): Check request syntax in all cases, even if there's
no pty.
(do_window_change_request): New function.
* src/interact.h (struct terminal_dimensions): Moved definition...
* src/tty.h (struct terminal_dimensions): ...to here.
* src/client_pty.c: Include tty.h.
* src/client.h (escape_info): New class.
* src/Makefile.am.in (liblsh_a_SOURCES): Added client_escape.c.
* src/client_escape.c: New file.
2001-04-10 Niels Mller <nisse@ehand.com>
* src/client.c (make_client_session): Use set_error_nonblocking.
2001-04-09 Niels Mller <nisse@ehand.com>
* src/werror.c (set_error_nonblocking): New function.
(set_error_stream): Deleted WITH_POLL argument.
(werror_options): Aded option --log-file.
(werror_argp_parser): Process --log-file option.
* ANNOUNCE: Changed "COPYRIGHT" to "LICENSE", by rms' request.
Fixed in 1.2 branch.
2001-04-08 Niels Mller <nisse@cuckoo.hack.org>
* src/lsh.c (main_argp_parser): Deleted old -L handling (moved to
client.c).
* src/sexp_commands.c (do_print_raw_hash_simple): Deleted unused
function.
* src/sexp.c (sexp_sn): Deleted unused function.
* src/io.c (make_listen_callback_no_peer): Deleted unused function.
* src/gc.c (gc): Display number of strings.
* src/client_session.c (do_client_session_eof): Deleted old code
that closed stdin here.
* src/client.c (do_exit_status): Deleted old code sending
CHANNEL_EOF here.
(do_exit_signal): Likewise.
(do_exit_signal): Signals in the exit-signal message are no longer
encoded as integers. XXX Fix in 1.2 branch?
* src/channel.c (do_exc_finish_channel_handler): Deleted old
(#if:ed out) code for raising EXC_FINISH_READ.
(channel_close_handler): Deleted old code calling the channel's
EOF handler here.
* src/lsh.c (main): Call io_final.
* src/io.h (lsh_fd): Added label attribute.
* src/io.c (kill_fd): Deleted.
(io_backend): Inherit resource.
(do_kill_io_backend): New function.
(make_io_backend): Call resource_init.
(io_final): New function.
(init_file): New argument LABEL.
(make_lsh_fd): New rgument LABEL. Updated callers.
(close_fd): Display label.
(io_iter): Display label.
* src/lsh-writekey.c (make_writekey): Deleted unneeded global
definitions.
* src/resource.c (dont_free_live_resource): Changed again, to
issue a fatal error.
* src/sexp_parser.h: Deleted unused file.
* src/testsuite/Makefile.am (TS_PROGS): Added string-test.
* src/testsuite/macros.m4 (TS_CHECK): New macro.
* src/testsuite/string-test.m4: New tests for string related
functions, currently only lsh_get_cstring.
* src/format.c (ssh_cformat): Deleted. Replaced all uses with
ssh_format.
(make_cstring_l): Deleted.
(make_cstring): Deleted.
(lsh_get_cstring): New function.
* src/werror.c (write_syslog): Don't use make_cstring_l.
* src/unix_user.c (do_verify_password): Use lsh_get_cstring.
(do_read_file): Likewise.
(do_read_file): Likewise.
(format_env_pair): Likewise.
(do_exec_shell): Likewise.
(make_unix_user): Likewise.
(do_lookup_user): Likewise.
* src/unix_interact.c (unix_read_password): Use lsh_get_cstring.
* src/server_session.c (do_spawn_exec): Use lsh_get_cstring.
* src/lsh.h (NUL_TERMINATED): Deleted.
* src/format.h (format_cstring, make_string): Renamed function.
And made it a macro. Updated callers.
* src/adns.c (do_resolve): Use lsh_get_cstring. Don't use
NUL_TERMINATED.
* src/io.c (address_info2sockaddr): Likewise.
(make_local_info): Likewise.
(io_listen_local): Likewise.
(io_connect_local): Likewise.
2001-04-05 Niels Mller <nisse@ehand.com>
* src/testsuite/functions.sh (run_lsh): Quote the command better.
* src/xalloc.c (lsh_string_alloc): Fixes, now compiles both with
and without DEBUG_ALLOC.
* src/werror.c (werror_argp_parser): Added missing break.
(werror): Handle the case where both verbose_flag and quiet_flag
are set.
* src/io.c (do_consuming_read): Free the string properly on EOF or
error. XXX Fix in 1.2 branch?
* src/client_userauth.c (make_client_userauth): Convert username
to utf8 once, here. Updated callers. Previously, the converted
strings leaked.
* src/client_session.c (do_client_session_eof): Use
close_fd_nicely. Otherwise we lose data. FIXED in 1.2 branch.
* src/Makefile.am.in (atoms_gperf.c): Massage gperf output to
reduce the number of compilation warnings.
2001-04-05 Niels Mller <nisse@cuckoo.hack.org>
* src/gc.c (gc_final): Check for leaked strings, and write any
clues.
* src/lsh.h (struct lsh_string_header): Added more debug info.
* src/xalloc.c (all_strings): New variable, for debugging.
(sanity_check_string_list): New function.
(lsh_string_alloc_clue): New function, remembering allocated
strings.
(lsh_string_free): Unregister string.
* src/werror.c (werror_vformat): Pass arguments to werror_write in
the correct order.
(werror_vformat): Likewise.
2001-04-04 Niels Mller <nisse@cuckoo.hack.org>
* src/testsuite/Makefile.am (CFLAGS): Reintroduced -O0, to make
compilation faster.
* src/client.c, src/client_keyexchange.c, src/client_userauth.c,
src/debug.c, src/disconnect.c, src/proxy.c,
src/proxy_x11forward.c, src/server.c, src/server_keyexchange.c,
src/server_userauth.c: Packet handlers should no longer free
packets.
* src/xalloc.c (number_of_strings): Define only if DEBUG_ALLOC.
(lsh_string_alloc): NUL-terminate strings, for simplicity.
(lsh_string_free): Check that string is still NUL-terminated.
* src/werror.c (program_name): New variable.
(werror_argp_parser): Initialize program_name.
(werror_vformat): Prefix messages with program_name.
(werror_vformat): Simplified code in 'z' case.
* src/proxy_userauth.c (do_forward_success): dup packet before
forwarding it.
Packet handlers should no longer free packets.
* src/channel.c (RETURN, END): Deleted macros.
Packet handlers should no longer free packets.
* src/keyexchange.c (do_handle_kexinit): dup packet when storing
it in the connection struct.
(do_handle_newkeys): Packet handlers should no longer free packets.
* src/write_buffer.c (make_write_buffer): Renamed
write_buffer_alloc to make_write_buffer. Updated callers.
* src/gc.c (gc_final): Check number_of_objects and
number_of_strings.
* src/connection.c (connection_handle_packet): Always free the
packet here. Packet handlers no longer needs to do that.
(connection_handle_packet): Accept SSH_MSG_IGNORE and
SSH_MSG_DEBUG in the KEX_STATE_NEWKEYS state.
* configure.in: Bumped version to 1.3.
* lsh-1.2 released.
* distribution-key.gpg: Updated key, more signatures and later
expiration date.
* src/sftp/Makefile.am (sftp_test_client_SOURCES): Added werror.c
and client.c
* src/sftp/sftp-test-client.c (struct client_ctx): Moved to
client.h
(werror_program_name): Defined here.
* src/sftp/client.c, src/sftp/client.h, src/sftp/werror.c,
src/sftp/werror.h: New files.
2001-04-03 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/testsuite/put-1-test: Check that the new file exists.
Use $TESTHOME for referring to the local file.
* src/sftp/sftp-test-client.c (do_put): Fixes and simplifications.
2001-04-03 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-test-client.c (do_open): New function.
(do_close): New function.
(do_get): Use do_open and do_close.
2001-04-02 Niels Mller <nisse@cuckoo.hack.org>
* configure.in: Bumped version to 1.2.
* src/Makefile.am.in (EXTRA_DIST): Added lcp.
* src/Makefile.am.in (noinst_SCRIPTS): Added the experimental lcp
script.
2001-04-02 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-server.c (sftp_process_read): Fixed size passed to
pread.
(debug): Added a prototype saying that it takes printf-style
arguments.
2001-04-02 Niels Mller <nisse@lysator.liu.se>
* src/sftp/sftp-server.c (sftp_process_realpath): Fixed invocation
of pathconf().
Include stdarg.h.
* src/sftp/testsuite: Adapted shell scripts to /bin/sh. Removed
uses of the "function" keyword, and use a full path when sourcing
common.sh.
* src/sftp/testsuite/run-tests: Use /bin/bash, as we use
bash-specific parameter expansion.
2001-04-01 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/Makefile.am (sftp_server_SOURCES,
sftp_test_client_SOURCES): Added xmalloc.c.
* src/sftp/xmalloc.c: New file. Defines xmalloc, xrealloc and
xstrdup.
* src/sftp/sftp-test-client.c (do_put): Use xmalloc.
* src/sftp/sftp-server.c (sftp_get_user): New function.
(sftp_get_group): Likewise.
(struct sftp_ctx): Added user_cache and group_cache.
(sftp_init): Initialize user_cache and group_cache.
(sftp_put_longname): Take a sftp_ctx * as argument. Use
sftp_get_user and sftp_get_group.
* src/sftp/buffer.c: Use xmalloc and xrealloc.
* src/sftp/idcache.c: Rewrite.
* src/sftp/Makefile.am (sftp_server_SOURCES): Added idcache.c.
* src/sftp/sftp-server.c: Use the functions from idcache.c.
* src/sftp/idcache.c: #include idcache.h. #if:ed out prototypes
and functions that aren't needed. Use malloc instead of xmalloc.
* src/sftp/idcache.h: New file.
* src/sftp/testsuite/setup-env: Clean up first.
* src/sftp/testsuite/get-1-test: New testcase.
* src/sftp/testsuite/ls-1-test: Likewise.
* src/sftp/testsuite/ls-2-test: Likewise
* src/sftp/testsuite/common.sh (PROGRAMDIR): New variable, holding
an absolute path to the directory where the programs are.
* src/sftp/sftp-test-client.c (sftp_client_get_id): New function.
(do_ls): Fixes and some simplification.
(do_get): Simplified. The old more featureful implementation left
#if:ed out.
* src/sftp/sftp-server.c (debug): New function.
(sftp_get_name): New function.
(struct sftp_dir): New struct.
(sftp_lstat_in_dir): New function.
(sftp_process_readdir): Handle directories that are not our
current working directory.
(parse_options): New function, currently only handling -d.
* src/sftp/buffer.c (sftp_check_input): Don't modify i->left here.
(sftp_get_data): ...but do it here instead.
(sftp_free_string): Reintroduced this function.
(sftp_get_string): This function now requires the user to
deallocate the string.
(sftp_get_string_auto): Simpler function, that deallocates strings
automatically.
(sftp_read_packet): Return failure (0), rather than crashing, if
there is data leftover from the previous packet.
(sftp_put_final_length): Calculate the length correctly.
(sftp_put_reset): Fixed assertion.
(sftp_put_attrib): Likewise.
* src/sftp/Makefile.am (noinst_PROGRAMS): Added dump-hex.
* src/sftp/sftp.h: Converted from #define:s to enums.
* src/sftp/dump-hex.c: New program that copies data from stdin to
stdout, and writes a hex dump to stderr in the process.
* src/sftp/debug-server: New script to dump communication between
sftp-server and sftp-test-client.
* src/sftp/configure.in: Added to cvs.
2001-03-31 Niels Mller <nisse@cuckoo.hack.org>
* src/sftp/acconfig.h: Added HAVE_GCC_ATTRIBUTE.
* src/sftp/.bootstrap: New file.
2001-03-30 Niels Mller <nisse@ehand.com>
* src/sftp/sftp-test-client.c (do_ls): Print the long name.
* src/sftp/sftp-server.c (sftp_get_name): New function.
(HANDLE_TYPE, HANDLE_DIR, HANDLE_FD): New macros.
Fixed handles. Simplified, deleting all sftp_free_string calls.
Use pread and pwrite, where available.
* src/sftp/buffer.c (struct sftp_input): Added array of strings,
so that callers don't have to free them explicitly.
(sftp_put_reset): New funtion.
(sftp_get_uint64): Use off_t, conditionalized on its size.
(sftp_put_uint64): Likewise.
* src/sftp/Makefile.am: Use AUTOMAKE_OPTIONS = foreign, added
sftp-test-client.
2001-03-28 Niels Mller <nisse@ehand.com>
* src/lcp (split spec): New function for splitting arguments.
Checked in first working version.
2001-03-27 Niels Mller <nisse@ehand.com>
* doc/srp-spec.nroff: Bumped version number, updated dates, and
added a section Further questions.
2001-03-26 Niels Mller <nisse@cuckoo.localdomain>
* Released lsh-1.1.9.
* misc/Makefile.am.in (EXTRA_DIST): Added more files to the dist:
libgcc2.c-patch, bootstrap.sh and make-dist.
* configure.in: By default, disable debug-alloc and debug-trace.
* src/testsuite/keygen-2-test: Use a smaller key size, 777 bits,
for speed.
* src/testsuite/keygen-1-test: Use NIST security level 2 (640
bits), for speed.
2001-03-25 Niels Mller <nisse@cuckoo.localdomain>
* src/testsuite/functions.sh (spawn_lshd): Use kill -9 to stop
lshd; otherwise lshd catching SIGTERM leads to timing problems.
* Released lsh-1.1.9.
* misc/libgcc2.c-patch: gcc patch.
* src/crypto.c: Deleted obsolete file.
* src/testsuite/Makefile.am (CFLAGS): -O0 is not needed anymore,
since most of the rijndael tests were deleted.
* src/proxy_userauth.c (do_proxy_userauth_continuation): Don't use
FORCE_APPLY.
* src/command.h (delayed_apply): Deleted class.
* configure.in: Bumped version to 1.1.9.
* src/testsuite/rijndael-test.m4: Deleted most tests, left 4 for
each key size.
* src/werror.c (fatal): If compiling with gcov, use exit(255)
instead of abort.
* src/spki_commands.c (parse_private_key): Use fatal instead of
abort.
* src/sexp.c (sexp_sn): #if:ed out.
* src/resource.c (dont_free_live_resource): Call werror, not
fatal. Currently, this is normal iff it happens during
gc_final.
* src/proxy_userauth.c (do_handle_userauth): Don't use
make_delay_continuation.
* src/lshg.c (main): Call gc_final.
* src/lshd.c (main): Call gc_final. When compiling with gcov,
catch the TERM signal and call exit() sometime later.
* src/lsh.c: Call gc_final().
* src/lsh-keygen.c: Use fatal(), not abort().
* src/io_commands.c (remember_continuation): Deleted class.
(do_remember_continuation): Deleted function.
(make_remember_continuation): Deleted function.
(do_listen): Deleted arguments resources and lookup. Updated
callers.
(do_simple_listen): Deleted function.
(make_simple_listen): Deleted function.
* src/gc.c (gc_final): New function.
* src/command.c (make_delayed_apply): Deleted function.
(delay_continuation): Deleted class.
(do_delay_continuation): Deleted function.
(make_delay_continuation): Deleted function.
* src/channel.c (connection_service): Deleted class.
* doc/lsh.texinfo (Invoking lsh): Added a note saying that
ordering is important.
* doc/TODO (TESTING): Added info on missing tests.
* configure.in: Define WITH_GCOV when compiling for gcov.
* acconfig.h (WITH_GCOV): New symbol.
2001-03-24 Niels Mller <nisse@cuckoo.localdomain>
* src/lsh_proxy.c (main): Use listen_callback instead of
simple_listen.
2001-03-22 Niels Mller <nisse@ehand.com>
* src/alist.c (alist_add): #if:ed out unused function.
2001-03-21 Niels Mller <nisse@ehand.com>
* src/client_password.c: Deleted.
* src/lshd.c (install_terminate_handler): Catch SIGTERM and
arrange for exit(0) to be called on termination.
2001-03-20 Niels Mller <nisse@ehand.com>
* src/lshg.c: Include client.h (used to include client.c. Argh!).
* src/lsh.h: Forward-declare struct interact.
* src/lsh.c: Don't include client_pty.h.
* src/client_session.c: Include client.h, not client_session.h.
* src/client_pty.c: Include client.h, not client_pty.h.
* src/client.h (make_pty_request): Moved declaration here.
* src/client.c: Don't include client_pty.h.
* src/client_session.h, src/client_pty.h: Deleted.
* src/Makefile.am.in (class-map): Let the shell find the awk
program.
2001-03-19 Niels Mller <nisse@cuckoo.localdomain>
* src/scm/gaba.scm (class-annotate): New function.
* src/make-class-map: Beautified output.
* src/lsh-keygen.c (main): Don't use blocking_write.
* src/blocking_write.h, src/blocking_write.c: Deleted.
* src/Makefile.am.in (liblsh_a_SOURCES): Removed blocking_write.c.
2001-03-16 Niels Mller <nisse@ehand.com>
* ANNOUNCE: Updated, preparing for lsh-1.2.
* src/server_session.c (format_exit_signal): Represent a signal
as a string, not an integer.
* src/translate_signal.c: Likewise.
* src/client.c (do_exit_signal): Don't use the signal name from
the packet, only the message.
* src/atoms.in: Added standard signals.
* src/resource.c (do_remember_resource): Bugfix: Use
KILL_RESOURCE, not KILL.
2001-03-15 Niels Mller <nisse@ehand.com>
* doc/srp-spec.nroff: Fixed definition of m2, pointed out by Tom
Holroyd.
2001-03-14 Niels Mller <nisse@cuckoo.localdomain>
* src/Makefile.am.in (class-map): Added rule for generating
class-map.
* src/make-class-map: New awk script for describing the class
hierarchy. Almost working.
2001-03-14 Niels Mller <nisse@ehand.com>
* src/tcpforward.h (remote_port): Deleted c attribute.
* src/string_buffer.c (string_buffer_length): Deleted.
* src/spki_commands.h (make_spki_parse_key): Deleted.
* src/spki_commands.c (spki_read_acls_command): Deleted.
* src/sexp.h (sexp_iterator): Deleted set method.
(SEXP_SET): Deleted.
* src/sexp.c (do_nil_get): New function.
(do_nil_assoc): New function.
(do_nil_left): New function.
(do_nil_next): New function.
(make_iter_nil): New function.
(do_format_nil): New function.
(sexp_nil): New definition, that isn't a cons.
(do_vector_set): Deleted.
(sexp_iter_cons): deleted.
(do_cons_get): Deleted.
(do_cons_set): Deleted.
(do_cons_assoc): Deleted.
(do_cons_left): Deleted.
(do_cons_next): Deleted.
(make_iter_cons): Deleted.
(do_format_sexp_tail): Deleted.
(do_format_sexp_cons): Deleted.
(sexp_c): Deleted.
* src/server_session.h (make_server_connection_service): Deleted.
* src/proxy_userauth.c (do_userauth_proxy): Don't use
make_once_continuation.
* src/lsh.c (do_lsh_default_handler): Don't use EXC_SERVICE.
* src/keyexchange.h (make_install_new_keys: Deleted.
* src/io_commands.c (collect_connect_port): Deleted.
(connect_with_port): Deleted.
* src/handshake.c: Adapted to change in collect_info_3.
* src/gateway.c (gateway): Disabled unused class.
* src/exception.c (dummy_exception): Deleted.
* src/digits.c (simple_decode_base64): Deleted.
* src/command.h (collect_info_4): Deleted.
* src/combinators.c: Adapted to change in collect_info_3.
* src/command.c (do_collect_4): Deleted.
(make_collect_state_3): Deleted.
(make_once_continuation): Deleted.
(make_catch_report_collect_body): Deleted.
(collect_state_2): Deleted attribute next.
* src/client.c (make_client_options): Deleted, as it wasn't used.
* src/channel_commands.h (channel_command): Deleted, it wasn't
used.
* src/channel.h: Deleted old code (CONNECTION_START and
format_channel_open_a).
* src/alist.h: Deleted ALIST_KEYS.
2001-03-13 Niels Mller <nisse@ehand.com>
* src/dsa_keygen.h, src/packet_ignore.c, src/packet_ignore.h,
src/password.c, src/password.h, src/proxy_channel.h,
src/session.c, src/session.h:Removed obsolete files.
2001-03-12 Niels Mller <nisse@cuckoo.localdomain>
* configure.in: Bumped version to 1.1.8.
* src/client_session.c (do_client_session_eof): Close stdout and
stderr, not stdin.
* src/client.c (do_exit_status): Don't call channel_eof. This way,
the behavior is more similar to other ssh clients.
* src/channel.c (channel_request_handler): Display more info about
unexpected packets.
(channel_close_handler): Don't display the "unexpected channel
close" message if CHANNEL_NO_WAIT_FOR_EOF is set.
Don't invoke the CHANNEL_EOF callback.
(channel_eof): Use the new CHANNEL_NO_WAIT_FOR_EOF flag.
(init_channel): Set CHANNEL_CLOSE_AT_EOF by default.
(channel_read_close_callback): Improved comment.
* src/channel.h (CHANNEL_NO_WAIT_FOR_EOF): New flag.
* src/tcpforward.c (do_tcpip_eof): Use the SHUT_WR constant, which
is defined in io.h if needed.
* src/server_session.c (spawn_process): Clear
CHANNEL_CLOSE_AT_EOF.
(do_exit_shell): Set CHANNEL_CLOSE_AT_EOF and
CHANNEL_NO_WAIT_FOR_EOF.
* src/gateway_channel.c (make_gateway_channel): Clear
CHANNEL_CLOSE_AT_EOF.
* src/io.h (SHUTDOWN_UNIX): Moved shutdown workaround from io.c,
and added a _UNIX-suffix on the macros to indicate that they are
for AF_UNIX sockets only.
* src/scm/gaba.scm (string-upcase): Moved definition to
guile-compat.scm. scsh already provides string-upcase, and the
definition here trigs a bug in string->list in scsh-0.5.2.
2001-03-12 Niels Mller <nisse@ehand.com>
* src/io.c (io_iter): Handle POLLERR.
2001-03-07 Niels Mller <nisse@cuckoo.localdomain>
* doc/TODO: scsh-0.5.2 is truly free software! Removed paragraph
describing the scsh situation.
* README: Say that scsh-0.5.2 is needed.
* src/scm/guile-compat.scm (char-set=): New function,
for compatibility with scsh-0.5.2.
(char-set:empty): New variable, likewise.
* src/scm/make-char-classes.scm (char-set-assoc): A real function
now, as I'm not sure that the usual assoc handles char-sets.
(char-set-empty?): Use char-set:empty (new in scsh-0.5.2).
(char-set=?): Removed function, scsh-0.5.2 provides a similar
function named char-set=.
2001-02-28 Niels Mller <nisse@cuckoo.localdomain>
* src/client.c (init_client_options): Initialize stderr_fork = 1.
(client_options): New option --no-cvs-workaround.
(client_argp_parser): Handle --no-cvs-workaround.
2001-02-25 Niels Mller <nisse@cuckoo.localdomain>
* Refer to a function foo as "foo", not "foo()", in messages and
comments. (GNU coding standard).
2001-02-22 Niels Mller <nisse@cuckoo.localdomain>
* src/randomness.c (do_arcfour_random): Spelling fix.
* Released lsh-1.1.7.
2001-02-22 Niels Mller <nisse@ehand.com>
* src/io.c (close_fd_read): New function.
(do_buffered_read): Call close_fd_read on EOF. This stops reading
from the file, and also marks it for closing unless it has a write
callback.
(do_consuming_read): Likewise.
2001-02-21 Niels Mller <nisse@ehand.com>
* src/io.c (do_consuming_read): Added an assert do check that
want_read is true. Check fd->hanged_up first.
2001-02-21 Niels Mller <nisse@cuckoo.localdomain>
* src/srp_exchange.c (srp_format_proofs): First argument to
MAKE_MAC must not have side effects.
* src/lsh-keygen.c (main): First argument to A_WRITE must not have
side effects.
* src/gateway_channel.c (do_gateway_channel_request): First
argument to COMMAND_CALL must not have side effects.
(do_channel_open_forward): Likewise.
* src/lsh.c (do_options2identities): Likewise.
* src/connection_commands.c (do_connection_if_srp): Don't use a
complex expression as the first argument to COMMAND_CALL.
* src/command.h (COMMAND_CALL): Generate a compile error if the
first argument is not an lvalue.
2001-02-20 Niels Mller <nisse@cuckoo.localdomain>
* doc/HACKING: Added section CAVEAT.
2001-02-20 Niels Mller <nisse@ehand.com>
* src/io.c, src/io.h, src/reaper.c, src/unix_interact.c: Added
volatile modifier to all uses of sig_atomic_t.
* src/client_userauth.c (do_userauth_success): Use verbose, not
werror, for success message.
2001-02-19 Niels Mller <nisse@cuckoo.localdomain>
* src/testsuite/Makefile.am (TS_MORE_PROGS): Added
lshg-tcpip-local-test.
2001-02-18 Niels Mller <nisse@cuckoo.localdomain>
* src/testsuite/tcpip-local-test: Don't pass -r to tcpconnect.
grep the output from tcpconnect.
* src/testsuite/tcpip-remote-test: Likewise.
* src/testsuite/lshg-tcpip-local-test: New test case.
* src/testsuite/functions.sh (spawn_lshg): New function.
* src/resource.c (do_remember_resource): If the resource list is
dead, immediately kill any resources added to it.
* src/lsh.c (main_argp_parser): Check if the action list is empty
at ARGP_KEY_END.
* src/lshg.c (main_argp_parser): Likewise.
* src/io.c (do_consuming_read): Don't close the fd on EOF.
(do_buffered_read): Likewise.
(sockaddr2info): Silently return NULL for AF_UNIX addresses.
* src/client.c (client_argp_parser): Don't check that the length
of the action list is non-zero at ARGP_KEY_END. lsh.c may add a
gatewaying action later.
* configure.in: Bumped version to 1.1.7.
2001-02-13 Niels Mller <nisse@cuckoo.localdomain>
* src/sftp/sftp-test-client.c: Added more code from Pontus Skld.
2001-02-13 Niels Mller <nisse@ehand.com>
* src/channel.c (do_exc_finish_channel_handler): Check
channel_count to determine if there are channels left. The code
used to just check next_channel, which was broken.
(alloc_channel): Update channel_count.
(dealloc_channel): Likewise.
(do_exc_finish_channel_handler): The handler for
EXC_FINISH_PENDING shouldn't raise EXC_FINISH_READ.
* src/channel.h (channel_table): New attribute channel_count.
* src/bignum.c (bignum_random): Added a comment about biased
numbers.
2001-02-11 Niels Mller <nisse@cuckoo.localdomain>
* src/sftp/sftp-server.c: Updated copyright notice to mention
Markus Friedl.
* src/sftp/filemode.c, src/sftp/filemode.h, src/sftp/idcache.c:
New files, copied from GNU Fileutils-4.0.
* src/sftp/sftp-test-client.c: Added dummy functions do_ls,
do_get, do_put and do_stat, and call them from main.
* src/sftp/sftp-server.c: Merged code from Pontus Skld.
(sftp_put_longname_mode): New function.
(sftp_put_longname): New function.
(sftp_put_filename): New function.
(getuser): New dummy function.
(getgroup): New dummy function.
* src/sftp/buffer.c: Let most output-related functions call exit()
directly on failure.
(sftp_put_reserve_length): New function, replacing sftp_put_reserve.
(sftp_put_length): New function.
(sftp_put_final_length): New function.
(sftp_put_printf): New function.
(sftp_put_strftime): New function.
(sftp_clear_attrib): Moved here from sftp-server.c.
(sftp_skip_extension): Likewise.
(sftp_get_attrib): Likewise.
(sftp_put_attrib): Likewise.
2001-02-11 Pavel Roskin <proski@gnu.org>
* acinclude.m4: Always quote first argument to AC_DEFUN
to allow redefining existing macros.
* configure.in: Quote the second argument to AC_SEARCH_LIBGMP.
2001-02-08 Niels Mller <nisse@cuckoo.localdomain>
* src/keyexchange.c (do_kexinit_filter): Don't crash if there are
no appropriate hostkeys.
2001-02-08 Niels Mller <nisse@ehand.com>
* src/dsa.c (generic_dsa_sign): Commented out debug statement that
leaks information about the secret key.
2001-02-07 Niels Mller <nisse@cuckoo.localdomain>
* src/algorithms.c (filter_algorithms): Document that the
functions may return NULL, and never returns an empty list.
2001-02-04 Niels Mller <nisse@lysator.liu.se>
* Released lsh-1.1.6.
* src/ssh-conv (SSH_CONV): Got rid of the bash:isms "if !" and
"&>".
2001-02-04 Niels Mller <nisse@cuckoo.localdomain>
* doc/lsh.texinfo (Action options): Edited the description of the
-g, not calling it "gateway mode", as the word "gateway" is
associated with the '-G' option.
(Invoking lshd): Documented --kerberos-passwords,
--password-helper and --login-shell.
Changed UPDATED-FOR to 1.1.6.
* configure.in: Bumped version to 1.1.6.
* src/testsuite/Makefile.am (TS_SH, TS_MORE_SH): Added a few more
tests.
* src/testsuite/functions.sh: New variable HOSTKEY for configuring
which hostkey to use.
* src/unix_user.c (unix_user_db): New attribute login_shell.
(do_lookup_user): Let self->login_shell, if non-NULL, override the
login shell in the passwd database.
(make_unix_user_db): New argument login_shell.
* src/rsa_keygen.c (rsa_generate_key): Changed "e not invertible"
message from werror() to debug().
* src/lshd.c (main_options): New option --login-shell.
* src/lsh-keygen.c (main): When generating an rsa key, display a
better message before trying again.
* src/client_keyexchange.c (do_handle_dh_reply): If the server's
signature doesn't verify, display a warning message before
disconnecting.
* src/rsa.c (parse_ssh_rsa_public): Call rsa_check_size, to make
sure that the ->size attribute is initialized.
* src/testsuite/key-2.private: Created an RSA testkey.
* src/testsuite/write-key-1-test, src/testsuite/write-key-2-test:
Renamed keygen-test and keygen-2-test.
* src/testsuite/conv-2-test: New test for reading an openssh rsa
key.
* src/testsuite/conv-1-test: Renamed conv-test.
2001-01-31 Niels Mller <nisse@ehand.com>
* src/server_publickey.c (do_authenticate): Include algorithm atom
in "Unknown publickey algorithm"-message.
* src/process_atoms (table): Fixed first reverse entry, {
"UNKNOWN", 7}.
* src/lsh-authorize: Redirect output from the type command to
/dev/null.
* src/server_password.c (do_authenticate): Don't free the username
twice.
* src/server_authorization.c (do_key_lookup): Support ssh-rsa
keys.
* src/lshd.c (main_argp_parser): Support RSA keys for publickey
userauth.
* src/io.c (io_iter): Changed POLLHUP handling some more. Now
POLLHUP && !POLLIN is treated as EOF.
2001-01-31 Niels Mller <nisse@cuckoo.localdomain>
* src/testsuite/lsh-cat-test: Use compare_output.
* src/testsuite/lsh-1-test: Use test_success.
* src/testsuite/lsh-2-test: Likewise.
* src/testsuite/lsh-3-test: Likewise.
* src/testsuite/lsh-4-test: Likewise.
* src/testsuite/tcpip-local-test: Likewise.
* src/testsuite/tcpip-remote-test: Likewise.
* src/testsuite/keygen-2-test: Use functions.sh and test_success.
* src/testsuite/keygen-test: Likewise.
* src/testsuite/functions.sh (at_exit): Fixed the at_exit
mechanism. The previous code always exited successfully.
(test_result): New variable for keeping the desired exit status.
(test_fail): New function.
(test_success): Likewise.
(compare_output): Likewise.
* src/testsuite/Makefile.am (TS_SH): Added conv-test.
* src/testsuite/conv-test: New test program.
* src/unix_random.c (background_poll): Changed werror() to debug().
(start_background_poll): Changed werror() to verbose().
* src/tcpforward.c (do_tcpip_eof): Removed channel close logic,
now in channel.c, channel_of_handler.
* src/ssh-conv: Don't look for lsh-decode-key in the current
directory. Added command line options --help, --usage,
--decode-with.
* src/server_session.c (do_eof): Removed channel close logic, now
in channel.c, channel_of_handler.
(do_exit_shell): Added a verbose() message.
* src/lsh-decode-key.c: Include rsa.h. Added program name prefix
to the diagnostic messages.
* src/io.c (do_buffered_read, do_consuming_read): Don't call
read() if fd->hanged_up is set.
(init_file): Initialize hanged_up.
2001-01-30 Niels Mller <nisse@cuckoo.localdomain>
* src/io.c (io_iter): Improved handling of POLLHUP. Set the
fd->hanged_up flag before calling FD_READ().
* src/io.h (lsh_fd): New attribute hanged_up.
* src/client.c (do_exit_status): Added a verbose() message.
* src/channel.c (channel_read_close_callback): Call channel_eof, not
channel_close.
(channel_eof_handler): Moved the channel close decision here.
2001-01-29 Niels Mller <nisse@cuckoo.localdomain>
* src/ssh-conv: Support ssh-rsa keys.
* src/lsh-decode-key.c (do_decode_key): Support ssh-rsa keys.
2001-01-24 Niels Mller <nisse@cuckoo.localdomain>
* src/spki_commands.c (parse_private_key): Generate keypairs with
algorithms ATOM_SSH_RSA, ATOM_SPKI_SIGN_RSA and ATOM_SPKI_SIGN_DSS.
* src/rsa.c (do_rsa_verify): Replaced ATOM_RSA_PKCS1_SHA1 with
ATOM_SSH_RSA, and replaced ATOM_SPKI with ATOM_SPKI_SIGN_RSA and
ATOM_SPKI_SIGN_DSS.
(do_rsa_sign): Likewise.
(parse_ssh_rsa_public): New function.
(make_ssh_rsa_verifier): New function.
* src/pkcs5-test.c: Include both unistd.h and stdlib.h, do get a
declaration of getopt().
* src/lsh.c (do_lsh_lookup): Handle ATOM_SSH_RSA.
(do_lsh_lookup): Replace ATOM_SPKI with ATOM_SPKI_SIGN_RSA and
ATOM_SPKI_SIGN_DSS.
* src/dsa.c (do_dsa_verify): Check that there's no trailing
garbage.
(do_dsa_verify): Replace ATOM_SPKI with ATOM_SPKI_SIGN_RSA and
ATOM_SPKI_SIGN_DSS.
(do_dsa_sign): Likewise.
* src/atoms.in: Updated algorithm names to match
draft-ietf-secsh-transport-09.txt.
* src/algorithms.c (algorithms_argp_parser): Replace ATOM_SPKI
with ATOM_SPKI_SIGN_RSA and ATOM_SPKI_SIGN_DSS.
(lookup_hostkey_algorithm): Likewise.
* src/Makefile.am.in: Removed $(srcdir) prefixes from targets.
* src/testsuite/Makefile.am (%.c): Likewise.
* configure.in (PREFIX): Replace NONE with $ac_default_prefix.
(SBINDIR): MAke a #define from sbindin. Currently broken.
* acconfig.h: Added SBINDIR.
2001-01-23 Niels Mller <nisse@ehand.com>
* src/tcpforward.c (do_tcpip_eof): Call shutdown(socket, SHUT_WR),
to signal to the local peer that there's no more data.
2001-01-18 Niels Mller <nisse@cuckoo.localdomain>
* src/lshd.c (KERBEROS_HELPER): Added /sbin/ between PREFIX and the
program name. Note that PREFIX seems to get a bogus value "NONE"
if the default prefix is used.
* src/sftp: New directory. Not compiled or used by default.
2001-01-17 Niels Mller <nisse@cuckoo.localdomain>
* src/lsh_types.h: Improved formatting.
* src/channel.c (alloc_channel): Use UINT32, not int, for
new_size.
2001-01-15 Niels Mller <nisse@ehand.com>
* misc/bootstrap.sh: Fixed comment.
* src/lsh-keygen.c (main_argp_parser): Don't use optarg (reported
by jps).
* Added Markus Friedl's sftp-server.c to contrib, for some random
hacking.
2001-01-10 Niels Mller <nisse@lysator.liu.se>
* src/pkcs5-test.c: Include stdlib.h instead of getopt.h.
2001-01-10 Niels Mller <nisse@cuckoo.localdomain>
* Released lsh-1.1.5.
* configure.in: Bumped version to 1.1.5.
2001-01-09 Niels Mller <nisse@cuckoo.localdomain>
* src/rsync/send.c: Deleted old code.
* src/rsync/send.c (rsync_send_init): Rewrote. Allocates a
slightly larger buffer.
(rsync_send_eof): New function.
(rsync_send_copy_in): Deleted th dst argument. Update sum_md5 and
size.
(rsync_send_read): New function.
(rsync_send_search): New function.
(rsync_send_flush): New function.
(rsync_send_write): New function.
(rsync_send): Rewrote and simplified. Now uses fewer states,
simpler eof handling, and calls several smaller functions.
* src/rsync/rsync.h (RSYNC_SUM_SIZE): Rename RSYNC_SUM_LENGTH.
(rsync_result_t): New enum for return types.
(struct rsync_receive_state): Renamed attribute full_sum to
sum_md5.
(struct rsync_receive_state): Made the state attribute an enum.
Moved the constants from receive.c, and renamed them to use a
RSYNC_RECIEVE_-prefix.
(struct rsync_send_state): Changed state and buffering.
* src/rsync/generate.c, src/rsync/receive.c, src/rsync/send.c,
src/rsync/rsync.h: Changed return types from int to enum
rsync_result_t.
* src/rsync/checksum.c (rsync_search): Renamed argument FOUND to
DONE, and set it properly for both successful and unsuccessful
searches.
* src/rsync/receive.c (rsync_receive_mode): Use an enum instead of
defines.
(rsync_update): Hash data on output.
(rsync_receive) STATE_LITERAL: Update avail_in and next_in after
calling rsync_update.
2001-01-02 Niels Mller <nisse@cuckoo.localdomain>
* src/unix_random.c (random_sources): Fixed bug in initialization
of the HAS_ALTERNATIVE fields. Noted by jps.
2000-12-28 Niels Mller <nisse@cuckoo.localdomain>
* src/lsh.c: Don't include unistd.h.
(main_argp_parser): Fixed bogus references to optarg (reported by
jps).
2000-12-23 Niels Mller <nisse@cuckoo.localdomain>
* Released lsh-1.1.4.
2000-12-23 Niels Mller <nisse@cuckoo.localdomain>
* src/Makefile.am.in (EXTRA_DIST): Removed references to the
getopt files getopt.c, getopt.h and getopt1.c.
* configure.in: Removed getopt-related tests (previously just
commented out).
2000-12-23 Niels Mller <nisse@lysator.liu.se>
* src/getopt.c, src/getopt1.c, src/getopt.h: Removed.
2000-12-22 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am (LDADD): Link with libargp.
($(srcdir)/%.c): Fix $(srcdir)-handling.
* src/Makefile.am.in (bootstrap): New target, replaces the
post-configure work previously done by misc/bootstrap.sh
* Makefile.am.in (bootstrap): New target.
2000-12-11 Niels Mller <nisse@cuckoo.localdomain>
* src/lsh.c (do_options2identities): Pass two alists to
make_spki_read_userkeys (reported by jps).
* src/spki_commands.c (make_spki_read_userkeys): Use separate
alists for symmetric algorithms and signature algorithms (reported
by jps).
* src/abstract_crypto.c (crypt_string_unpad): Adjust length
properly (reported by jps).
2000-12-09 Niels Mller <nisse@cuckoo.localdomain>
* src/Makefile.am.in (LDADD, lshg_LDADD): Use @LIBARGP@
* misc/bootstrap.sh: Use set -e. Bootstrap in the src/argp
subdirectory.
2000-11-27 Niels Mller <nisse@cuckoo.localdomain>
* configure.in: Use AC_LIB_ARGP.
* acinclude.m4 (AC_LIB_ARGP): New test.
2000-11-27 Niels Mller <nisse@cuckoo.localdomain>
* Released lsh-1.1.3.
* src/client.c (client_argp_parser): Handle remote_forward
properly, and install a channel_open_forwarded_tcpip handler if
needed (recovered from an earlier lsh.c). Some other cleanup.
* src/abstract_crypto.h: Some cleanup.
* src/abstract_io.h: Likewise.
* src/channel.c: Likewise.
* src/channel.h: Likewise.
* src/channel_commands.h: Likewise.
* src/connection.h: Likewise.
* src/connection_commands.c: Likewise.
* src/dh_exchange.c: Likewise.
* src/exception.h: Likewise.
* src/gateway.c: Likewise.
* src/gateway_channel.c: Likewise.
* src/gateway_commands.c: Likewise.
* src/handshake.c: Likewise.
* src/handshake.h: Likewise.
* src/io.h: Likewise.
* src/io_commands.c: Likewise.
* src/io_commands.h: Likewise.
* src/keyexchange.h: Likewise.
* src/lsh.c: Likewise.
* src/lsh_proxy.c: Likewise.
* src/lshg.c: Likewise.
* src/publickey_crypto.h: Likewise.
* src/randomness.c: Likewise.
* src/randomness.h: Likewise.
* src/read_packet.c: Likewise.
* src/rsa.c: Likewise.
* src/server_pty.h: Likewise.
* src/server_session.c: Likewise.
* src/sexp.h: Likewise.
* src/sexp_parser.c: Likewise.
* src/sexp_streamed_parser.c: Likewise.
* src/sexp_test.c: Likewise.
* src/spki_commands.c: Likewise.
* src/spki_commands.h: Likewise.
* src/ssh1_fallback.c: Likewise.
* src/tcpforward.c: Likewise.
* src/unix_random.c: Likewise.
* src/zlib.c: Likewise.
2000-11-26 Niels Mller <nisse@cuckoo.localdomain>
* src/parse.c (parse_rest, parse_rest_copy): Renamed parse_rest to
parse_rest_copy. New function parse_rest.
* src/gateway_channel.c (do_gateway_channel_request): Use
format_channel_request_i().
(gateway_channel_open_continuation): New attribute fallback.
(do_gateway_channel_open_continuation): Set the target channel's
request_fallback pointer.
(do_channel_open_forward): Set the origin channel's
request_fallback pointer.
* src/channel.h (ssh_channel): Added request_fallback attribute.
(channel_request_info): New struct.
(channel_request): Use a channel_request_info argument.
* src/channel.c (parse_channel_request): New function.
(DEFINE_PACKET_HANDLER): Use parse_channel_request. Invoke request
fallback if appropriate.
(init_channel): Initialize request_fallback = NULL.
(format_channel_open_s): Use a struct lsh_string for the type
argument.
(format_channel_request_i): New function.
* src/spki_commands.c (spki_read_userkeys): Try to decrypt the key.
(make_spki_read_userkeys): New argument tty. If supplied, try to
decrypt password protected keys.
* src/proxy_agentforward.c (do_proxy_open_auth_agent): Updated to
use struct channel_open_info.
* src/proxy_x11forward.c (do_proxy_open_x11): Likewise.
* src/proxy_tcpforward.c (do_proxy_open_direct_tcpip): Likewise.
* src/proxy_session.c (do_proxy_open_session): Likewise.
* src/server_session.c (do_open_session): Likewise.
* src/tcpforward.c: Likewise.
* src/parse.c (parse_rest): New function.
* src/lshg.c: Use new client.c option parsing.
* src/lsh_proxy.c: Adapted to stricter alist typing.
* src/lshd.c: Likewise.
* src/reaper.c: Likewise.
* src/server_publickey.c: Likewise.
* src/spki.c: Likewise.
* src/lsh.c: Moved some of the option parsing to client.c.
* src/gateway_commands.c (gateway_make_connection): Install an
open_fallback.
* src/gateway_channel.c (gateway_channel_open_command): Use a
string instead of an atom to represent the chennel type.
(do_gateway_channel_open): Use format_channel_opn_s().
(make_gateway_channel_open_command): Take an struct
channel_open_info * as argument.
(do_channel_open_forward): New function.
(gateway_channel_open_forward): Channel open handler that forwards
any channel open request, of any type.
* src/client_session.c (client_session_channel): Renamed the
class client_session.
* src/client.h (CLIENT_ARGP_ACTION_GROUP): New constant.
(CLIENT_ARGP_MODIFIER_GROUP): New constant.
(client_options): New class.
* src/client.c: Moved most of the option parsing from lsh.c to
this file.
* src/channel.c (make_channel_table): Initialize open_fallback =
NULL;
(global_request_handler): Prepared for using a fallback handler.
(channel_request_handler): Likewise.
(channel_open_continuation): Renamed attributes to
send_window_size and send_max_packet.
(parse_channel_open): New function.
(DEFINE_PACKET_HANDLER): Use parse_channel_open. Invoke
open_fallback if there's no more specific handler for the channel
type.
(format_channel_open_s): New function.
(format_channel_open_a): New function (currently #if:ed out).
* src/channel.h (struct channel_open_info): New struct to
represent the common information in SSH_MSH_CHANNEL_OPEN.
(channel_table): New attribute open_fallback.
(channel_open): Use a channel_open_info for the arguments.
* src/alist.h (alist): Use struct lsh_object *, not void *, to
pass values.
* src/alist.c (alist_select): New function.
* src/algorithms.c (make_algorithms_options): New function.
* doc/TODO: Some updates.
* configure.in: Bumped version to 1.1.3.
2000-11-20 Niels Mller <nisse@cuckoo.localdomain>
* src/algorithms.h, src/client.h, src/client_keyexchange.c,
src/client_userauth.c, src/connection.c, src/format.h,
src/interact.c, src/interact.h, src/io.c, src/io.h,
src/lsh-writekey.c, src/lsh.c, src/lshd.c, src/reaper.c,
src/reaper.h, src/server_session.c, src/spki.c,
src/spki_commands.c, src/srp-gen.c, src/tty.c, src/tty.h: Removed
old #if:ed out code.
* ChangeLog: Rotated ChangeLog, creating ChangeLog.2.
|