diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/util/mkfiles.pl | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/util/mkfiles.pl')
| -rw-r--r-- | src/lib/libcrypto/util/mkfiles.pl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl index 928a274303..bc78510f56 100644 --- a/src/lib/libcrypto/util/mkfiles.pl +++ b/src/lib/libcrypto/util/mkfiles.pl | |||
| @@ -51,14 +51,15 @@ my @dirs = ( | |||
| 51 | "crypto/ocsp", | 51 | "crypto/ocsp", |
| 52 | "crypto/ui", | 52 | "crypto/ui", |
| 53 | "crypto/krb5", | 53 | "crypto/krb5", |
| 54 | "fips", | 54 | "fips-1.0", |
| 55 | "fips/aes", | 55 | "fips-1.0/aes", |
| 56 | "fips/des", | 56 | "fips-1.0/des", |
| 57 | "fips/dsa", | 57 | "fips-1.0/dsa", |
| 58 | "fips/dh", | 58 | "fips-1.0/dh", |
| 59 | "fips/rand", | 59 | "fips-1.0/hmac", |
| 60 | "fips/rsa", | 60 | "fips-1.0/rand", |
| 61 | "fips/sha1", | 61 | "fips-1.0/rsa", |
| 62 | "fips-1.0/sha", | ||
| 62 | "ssl", | 63 | "ssl", |
| 63 | "apps", | 64 | "apps", |
| 64 | "test", | 65 | "test", |