diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/util/mkfiles.pl | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/util/mkfiles.pl')
| -rw-r--r-- | src/lib/libcrypto/util/mkfiles.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl index 1282392fea..67fb8694c8 100644 --- a/src/lib/libcrypto/util/mkfiles.pl +++ b/src/lib/libcrypto/util/mkfiles.pl | |||
| @@ -47,6 +47,7 @@ my @dirs = ( | |||
| 47 | "crypto/x509", | 47 | "crypto/x509", |
| 48 | "crypto/x509v3", | 48 | "crypto/x509v3", |
| 49 | "crypto/conf", | 49 | "crypto/conf", |
| 50 | "crypto/jpake", | ||
| 50 | "crypto/txt_db", | 51 | "crypto/txt_db", |
| 51 | "crypto/pkcs7", | 52 | "crypto/pkcs7", |
| 52 | "crypto/pkcs12", | 53 | "crypto/pkcs12", |
| @@ -58,6 +59,15 @@ my @dirs = ( | |||
| 58 | "crypto/store", | 59 | "crypto/store", |
| 59 | "crypto/pqueue", | 60 | "crypto/pqueue", |
| 60 | "crypto/cms", | 61 | "crypto/cms", |
| 62 | "fips", | ||
| 63 | "fips/aes", | ||
| 64 | "fips/des", | ||
| 65 | "fips/dsa", | ||
| 66 | "fips/dh", | ||
| 67 | "fips/hmac", | ||
| 68 | "fips/rand", | ||
| 69 | "fips/rsa", | ||
| 70 | "fips/sha", | ||
| 61 | "ssl", | 71 | "ssl", |
| 62 | "apps", | 72 | "apps", |
| 63 | "engines", | 73 | "engines", |